Compare commits
5 Commits
2ba6785f09
...
e2f8f4da83
Author | SHA1 | Date |
---|---|---|
SmallJoker | e2f8f4da83 | |
SmallJoker | e40be619f2 | |
adrido | bd6f1cca9d | |
Thomas Rudin | 9a07792f4d | |
SmallJoker | a687efa6df |
206
README.md
206
README.md
|
@ -284,165 +284,77 @@ Library specific options:
|
|||
VORBIS_LIBRARY - Only if building with sound; path to libvorbis.a/libvorbis.so/libvorbis.dll.a
|
||||
XXF86VM_LIBRARY - Only on Linux; path to libXXf86vm.a/libXXf86vm.so
|
||||
ZLIB_DLL - Only on Windows; path to zlib1.dll
|
||||
ZLIBWAPI_DLL - Only on Windows; path to zlibwapi.dll
|
||||
ZLIB_INCLUDE_DIR - Directory that contains zlib.h
|
||||
ZLIB_LIBRARY - Path to libz.a/libz.so/zlibwapi.lib
|
||||
ZLIB_LIBRARY - Path to libz.a/libz.so/zlib.lib
|
||||
|
||||
### Compiling on Windows
|
||||
|
||||
* This section is outdated. In addition to what is described here:
|
||||
* In addition to minetest, you need to download [minetest_game](https://github.com/minetest/minetest_game).
|
||||
* If you wish to have sound support, you need libogg, libvorbis and libopenal
|
||||
### Requirements
|
||||
|
||||
* You need:
|
||||
* CMake:
|
||||
http://www.cmake.org/cmake/resources/software.html
|
||||
* A compiler
|
||||
* MinGW: http://www.mingw.org/
|
||||
* or Visual Studio: http://msdn.microsoft.com/en-us/vstudio/default
|
||||
* Irrlicht SDK 1.7:
|
||||
http://irrlicht.sourceforge.net/downloads.html
|
||||
* Zlib headers (zlib125.zip)
|
||||
http://www.winimage.com/zLibDll/index.html
|
||||
* Zlib library (zlibwapi.lib and zlibwapi.dll from zlib125dll.zip):
|
||||
http://www.winimage.com/zLibDll/index.html
|
||||
* SQLite3 headers and library
|
||||
https://www.sqlite.org/download.html
|
||||
* Optional: gettext library and tools:
|
||||
http://gnuwin32.sourceforge.net/downlinks/gettext.php
|
||||
* This is used for other UI languages. Feel free to leave it out.
|
||||
* And, of course, Minetest:
|
||||
http://minetest.net/download
|
||||
* Steps:
|
||||
* Select a directory called DIR hereafter in which you will operate.
|
||||
* Make sure you have CMake and a compiler installed.
|
||||
* Download all the other stuff to DIR and extract them into there.
|
||||
("extract here", not "extract to packagename/")
|
||||
* NOTE: zlib125dll.zip needs to be extracted into zlib125dll
|
||||
* NOTE: You need to extract sqlite3.h & sqlite3ext.h from the SQLite 3
|
||||
source and sqlite3.dll & sqlite3.def from the SQLite 3 precompiled
|
||||
binaries into "sqlite3" directory, and generate sqlite3.lib using
|
||||
command "LIB /DEF:sqlite3.def /OUT:sqlite3.lib"
|
||||
* All those packages contain a nice base directory in them, which
|
||||
should end up being the direct subdirectories of DIR.
|
||||
* You will end up with a directory structure like this (+=dir, -=file):
|
||||
-----------------
|
||||
+ DIR
|
||||
* zlib-1.2.5.tar.gz
|
||||
* zlib125dll.zip
|
||||
* irrlicht-1.8.3.zip
|
||||
* sqlite-amalgamation-3130000.zip (SQLite3 headers)
|
||||
* sqlite-dll-win32-x86-3130000.zip (SQLite3 library for 32bit system)
|
||||
* 110214175330.zip (or whatever, this is the minetest source)
|
||||
+ zlib-1.2.5
|
||||
* zlib.h
|
||||
+ win32
|
||||
...
|
||||
+ zlib125dll
|
||||
* readme.txt
|
||||
+ dll32
|
||||
...
|
||||
+ irrlicht-1.8.3
|
||||
+ lib
|
||||
+ include
|
||||
...
|
||||
+ sqlite3
|
||||
sqlite3.h
|
||||
sqlite3ext.h
|
||||
sqlite3.lib
|
||||
sqlite3.dll
|
||||
+ gettext (optional)
|
||||
+bin
|
||||
+include
|
||||
+lib
|
||||
+ minetest
|
||||
+ src
|
||||
+ doc
|
||||
* CMakeLists.txt
|
||||
...
|
||||
-----------------
|
||||
* Start up the CMake GUI
|
||||
* Select "Browse Source..." and select DIR/minetest
|
||||
* Now, if using MSVC:
|
||||
* Select "Browse Build..." and select DIR/minetest-build
|
||||
* Else if using MinGW:
|
||||
* Select "Browse Build..." and select DIR/minetest
|
||||
* Select "Configure"
|
||||
* Select your compiler
|
||||
* It will warn about missing stuff, ignore that at this point. (later don't)
|
||||
* Make sure the configuration is as follows
|
||||
(note that the versions may differ for you):
|
||||
* Visual Studio 2015 or newer https://visualstudio.microsoft.com
|
||||
* CMake https://cmake.org/download/
|
||||
* vcpkg https://github.com/Microsoft/vcpkg
|
||||
* git https://git-scm.com/downloads
|
||||
|
||||
BUILD_CLIENT [X]
|
||||
BUILD_SERVER [ ]
|
||||
CMAKE_BUILD_TYPE Release
|
||||
CMAKE_INSTALL_PREFIX DIR/minetest-install
|
||||
IRRLICHT_SOURCE_DIR DIR/irrlicht-1.8.3
|
||||
RUN_IN_PLACE [X]
|
||||
WARN_ALL [ ]
|
||||
ZLIB_DLL DIR/zlib125dll/dll32/zlibwapi.dll
|
||||
ZLIB_INCLUDE_DIR DIR/zlib-1.2.5
|
||||
ZLIB_LIBRARIES DIR/zlib125dll/dll32/zlibwapi.lib
|
||||
GETTEXT_BIN_DIR DIR/gettext/bin
|
||||
GETTEXT_INCLUDE_DIR DIR/gettext/include
|
||||
GETTEXT_LIBRARIES DIR/gettext/lib/intl.lib
|
||||
GETTEXT_MSGFMT DIR/gettext/bin/msgfmt
|
||||
### Compiling and Installing the dependencies
|
||||
|
||||
* If CMake complains it couldn't find SQLITE3, choose "Advanced" box on the
|
||||
right top corner, then specify the location of SQLITE3_INCLUDE_DIR and
|
||||
SQLITE3_LIBRARY manually.
|
||||
* If you want to build 64-bit minetest, you will need to build 64-bit version
|
||||
of irrlicht engine manually, as only 32-bit pre-built library is provided.
|
||||
* Hit "Configure"
|
||||
* Hit "Configure" once again 8)
|
||||
* If something is still coloured red, you have a problem.
|
||||
* Hit "Generate"
|
||||
If using MSVC:
|
||||
* Open the generated minetest.sln
|
||||
* The project defaults to the "Debug" configuration. Make very sure to
|
||||
select "Release", unless you want to debug some stuff (it's slower
|
||||
and might not even work at all)
|
||||
* Build the ALL_BUILD project
|
||||
* Build the INSTALL project
|
||||
* You should now have a working game with the executable in
|
||||
DIR/minetest-install/bin/minetest.exe
|
||||
* Additionally you may create a zip package by building the PACKAGE
|
||||
project.
|
||||
If using MinGW:
|
||||
* Using the command line, browse to the build directory and run 'make'
|
||||
(or mingw32-make or whatever it happens to be)
|
||||
* You may need to copy some of the downloaded DLLs into bin/, see what
|
||||
running the produced executable tells you it doesn't have.
|
||||
* You should now have a working game with the executable in
|
||||
DIR/minetest/bin/minetest.exe
|
||||
It is highly recommended to use vcpkg as package manager.
|
||||
|
||||
### Bat script to build Windows releases of Minetest
|
||||
#### a) Using vcpkg to install dependencies
|
||||
|
||||
This is how we build Windows releases.
|
||||
After you successfully built vcpkg you can easily install the required libaries.
|
||||
```powershell
|
||||
vcpkg install irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit --triplet x64-windows
|
||||
```
|
||||
`curl` is optional, but required to read the serverlist, `curl[winssl]` is required to use the content store.
|
||||
|
||||
set sourcedir=%CD%
|
||||
set installpath="C:\tmp\minetest_install"
|
||||
set irrlichtpath="C:\tmp\irrlicht-1.7.2"
|
||||
`openal-soft`, `libvorbis` and `libogg` are optional, but required to use sound.
|
||||
|
||||
set builddir=%sourcedir%\bvc10
|
||||
mkdir %builddir%
|
||||
pushd %builddir%
|
||||
cmake %sourcedir% -G "Visual Studio 10" -DIRRLICHT_SOURCE_DIR=%irrlichtpath% -DRUN_IN_PLACE=TRUE -DCMAKE_INSTALL_PREFIX=%installpath%
|
||||
if %errorlevel% neq 0 goto fail
|
||||
"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" ALL_BUILD.vcxproj /p:Configuration=Release
|
||||
if %errorlevel% neq 0 goto fail
|
||||
"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" INSTALL.vcxproj /p:Configuration=Release
|
||||
if %errorlevel% neq 0 goto fail
|
||||
"C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" PACKAGE.vcxproj /p:Configuration=Release
|
||||
if %errorlevel% neq 0 goto fail
|
||||
popd
|
||||
echo Finished.
|
||||
exit /b 0
|
||||
`freetype` is optional, it allows true-type font rendering.
|
||||
|
||||
:fail
|
||||
popd
|
||||
echo Failed.
|
||||
exit /b 1
|
||||
`luajit` is optional and replaces the integrated lua interpreter with a faster just in time interpreter
|
||||
|
||||
There are other libaries that are optional, but are not tested if they can build and linked correctly.
|
||||
|
||||
`--triplet` specify the target triplet e.g. x64-windows x86-windows
|
||||
|
||||
#### b) Compile the dependencies on your own
|
||||
|
||||
This is outdated and not recommended. Follow the instructions on https://dev.minetest.net/Build_Win32_Minetest_including_all_required_libraries#VS2012_Build
|
||||
|
||||
### Compile Minetest
|
||||
|
||||
#### a) Using the vcpkg toolchain and CMakeGUI
|
||||
1. Start up the CMake GUI
|
||||
2. Select "Browse Source..." and select DIR/minetest
|
||||
3. Select "Browse Build..." and select DIR/minetest-build
|
||||
4. Select "Configure"
|
||||
5. Choose the right visual Studio version and target platform. It has to match the version of the installed dependencies
|
||||
6. Choose "Specify toolchain file for cross-compiling"
|
||||
7. Click "Next"
|
||||
8. Select the vcpkg toolchain file e.g. `D:/vcpkg/scripts/buildsystems/vcpkg.cmake`
|
||||
9. Click Finish
|
||||
10. Wait until cmake have generated the cash file
|
||||
11. If there are any errors, solve them and hit "Configure"
|
||||
12. Click "Generate"
|
||||
13. Click "Open Project"
|
||||
14. Compile Minetest inside Visual studio.
|
||||
|
||||
#### b) Using the vcpkg toolchain and the commandline
|
||||
|
||||
Run the following script in Powershell:
|
||||
|
||||
```powershell
|
||||
cmake . -G"Visual Studio 15 2017 Win64" -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT=0 -DENABLE_CURSES=0
|
||||
cmake --build . --config Release
|
||||
```
|
||||
Make sure that the right compiler is selected and the path to the vcpkg toolchain is correct.
|
||||
|
||||
#### c) Using your own compiled libaries
|
||||
|
||||
**This is outdated and not recommended**
|
||||
|
||||
Follow the instructions on https://dev.minetest.net/Build_Win32_Minetest_including_all_required_libraries#VS2012_Build
|
||||
|
||||
### Windows Installer using WIX Toolset
|
||||
|
||||
|
|
|
@ -8,6 +8,9 @@ local blocks_forceloaded
|
|||
local blocks_temploaded = {}
|
||||
local total_forceloaded = 0
|
||||
|
||||
-- true, if the forceloaded blocks got changed (flag for persistence on-disk)
|
||||
local forceload_blocks_changed = false
|
||||
|
||||
local BLOCKSIZE = core.MAP_BLOCKSIZE
|
||||
local function get_blockpos(pos)
|
||||
return {
|
||||
|
@ -31,6 +34,9 @@ local function get_relevant_tables(transient)
|
|||
end
|
||||
|
||||
function core.forceload_block(pos, transient)
|
||||
-- set changed flag
|
||||
forceload_blocks_changed = true
|
||||
|
||||
local blockpos = get_blockpos(pos)
|
||||
local hash = core.hash_node_position(blockpos)
|
||||
local relevant_table, other_table = get_relevant_tables(transient)
|
||||
|
@ -51,6 +57,9 @@ function core.forceload_block(pos, transient)
|
|||
end
|
||||
|
||||
function core.forceload_free_block(pos, transient)
|
||||
-- set changed flag
|
||||
forceload_blocks_changed = true
|
||||
|
||||
local blockpos = get_blockpos(pos)
|
||||
local hash = core.hash_node_position(blockpos)
|
||||
local relevant_table, other_table = get_relevant_tables(transient)
|
||||
|
@ -95,6 +104,28 @@ core.after(5, function()
|
|||
end
|
||||
end)
|
||||
|
||||
core.register_on_shutdown(function()
|
||||
-- persists the currently forceloaded blocks to disk
|
||||
local function persist_forceloaded_blocks()
|
||||
write_file(wpath.."/force_loaded.txt", blocks_forceloaded)
|
||||
end)
|
||||
end
|
||||
|
||||
-- periodical forceload persistence
|
||||
local function periodically_persist_forceloaded_blocks()
|
||||
|
||||
-- only persist if the blocks actually changed
|
||||
if forceload_blocks_changed then
|
||||
persist_forceloaded_blocks()
|
||||
|
||||
-- reset changed flag
|
||||
forceload_blocks_changed = false
|
||||
end
|
||||
|
||||
-- recheck after some time
|
||||
core.after(10, periodically_persist_forceloaded_blocks)
|
||||
end
|
||||
|
||||
-- persist periodically
|
||||
core.after(5, periodically_persist_forceloaded_blocks)
|
||||
|
||||
-- persist on shutdown
|
||||
core.register_on_shutdown(persist_forceloaded_blocks)
|
||||
|
|
|
@ -1,19 +1,16 @@
|
|||
mark_as_advanced(CURL_LIBRARY CURL_INCLUDE_DIR)
|
||||
|
||||
find_library(CURL_LIBRARY NAMES curl)
|
||||
find_library(CURL_LIBRARY NAMES curl libcurl)
|
||||
find_path(CURL_INCLUDE_DIR NAMES curl/curl.h)
|
||||
|
||||
set(CURL_REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR)
|
||||
|
||||
if(WIN32)
|
||||
find_file(CURL_DLL NAMES libcurl-4.dll
|
||||
PATHS
|
||||
"C:/Windows/System32"
|
||||
# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
|
||||
if(NOT VCPKG_APPLOCAL_DEPS)
|
||||
find_file(CURL_DLL NAMES libcurl-4.dll libcurl.dll
|
||||
DOC "Path to the cURL DLL (for installation)")
|
||||
mark_as_advanced(CURL_DLL)
|
||||
set(CURL_REQUIRED_VARS ${CURL_REQUIRED_VARS} CURL_DLL)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(CURL DEFAULT_MSG ${CURL_REQUIRED_VARS})
|
||||
|
||||
find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARY CURL_INCLUDE_DIR)
|
||||
|
|
|
@ -43,6 +43,7 @@ else()
|
|||
/usr/local/include/irrlicht
|
||||
/usr/include/irrlicht
|
||||
/system/develop/headers/irrlicht #Haiku
|
||||
PATH_SUFFIXES "include/irrlicht"
|
||||
)
|
||||
|
||||
find_library(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht
|
||||
|
@ -56,6 +57,8 @@ endif()
|
|||
|
||||
# On Windows, find the DLL for installation
|
||||
if(WIN32)
|
||||
# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
|
||||
if(NOT VCPKG_APPLOCAL_DEPS)
|
||||
if(MSVC)
|
||||
set(IRRLICHT_COMPILER "VisualStudio")
|
||||
else()
|
||||
|
@ -66,6 +69,7 @@ if(WIN32)
|
|||
"${IRRLICHT_SOURCE_DIR}/bin/Win32-${IRRLICHT_COMPILER}"
|
||||
DOC "Path of the Irrlicht dll (for installation)"
|
||||
)
|
||||
endif()
|
||||
endif(WIN32)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
|
|
@ -19,6 +19,16 @@ FIND_PATH(LUA_INCLUDE_DIR luajit.h
|
|||
/opt
|
||||
)
|
||||
|
||||
# Test if running on vcpkg toolchain
|
||||
if(DEFINED VCPKG_TARGET_TRIPLET AND DEFINED VCPKG_APPLOCAL_DEPS)
|
||||
# On vcpkg luajit is 'lua51' and normal lua is 'lua'
|
||||
FIND_LIBRARY(LUA_LIBRARY
|
||||
NAMES lua51
|
||||
HINTS
|
||||
$ENV{LUA_DIR}
|
||||
PATH_SUFFIXES lib
|
||||
)
|
||||
else()
|
||||
FIND_LIBRARY(LUA_LIBRARY
|
||||
NAMES luajit-5.1
|
||||
HINTS
|
||||
|
@ -32,6 +42,8 @@ FIND_LIBRARY(LUA_LIBRARY
|
|||
/opt/csw
|
||||
/opt
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h")
|
||||
FILE(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT .+\"")
|
||||
|
|
|
@ -176,7 +176,7 @@ option(ENABLE_LEVELDB "Enable LevelDB backend" TRUE)
|
|||
set(USE_LEVELDB FALSE)
|
||||
|
||||
if(ENABLE_LEVELDB)
|
||||
find_library(LEVELDB_LIBRARY leveldb)
|
||||
find_library(LEVELDB_LIBRARY NAMES leveldb libleveldb)
|
||||
find_path(LEVELDB_INCLUDE_DIR db.h PATH_SUFFIXES leveldb)
|
||||
if(LEVELDB_LIBRARY AND LEVELDB_INCLUDE_DIR)
|
||||
set(USE_LEVELDB TRUE)
|
||||
|
@ -251,23 +251,12 @@ if(WIN32)
|
|||
set(PLATFORM_LIBS ws2_32.lib version.lib shlwapi.lib ${PLATFORM_LIBS})
|
||||
|
||||
# Zlib stuff
|
||||
set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
|
||||
CACHE PATH "Zlib include directory")
|
||||
set(ZLIB_LIBRARIES "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.lib"
|
||||
CACHE FILEPATH "Path to zlib library (usually zlibwapi.lib)")
|
||||
set(ZLIB_DLL "${PROJECT_SOURCE_DIR}/../../zlib125dll/dll32/zlibwapi.dll"
|
||||
CACHE FILEPATH "Path to zlib DLL (for installation)")
|
||||
set(ZLIBWAPI_DLL "" CACHE FILEPATH "Path to zlibwapi DLL")
|
||||
set(IRRLICHT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../../irrlicht-1.7.2"
|
||||
CACHE PATH "irrlicht dir")
|
||||
if(USE_FREETYPE)
|
||||
set(FREETYPE_INCLUDE_DIR_ft2build "${PROJECT_SOURCE_DIR}/../../freetype2/include/"
|
||||
CACHE PATH "freetype include dir")
|
||||
set(FREETYPE_INCLUDE_DIR_freetype2 "${PROJECT_SOURCE_DIR}/../../freetype2/include/freetype"
|
||||
CACHE PATH "freetype include dir")
|
||||
set(FREETYPE_LIBRARY "${PROJECT_SOURCE_DIR}/../../freetype2/objs/win32/vc2005/freetype247.lib"
|
||||
CACHE FILEPATH "Path to freetype247.lib")
|
||||
endif()
|
||||
find_path(ZLIB_INCLUDE_DIR "zlib.h" DOC "Zlib include directory")
|
||||
find_library(ZLIB_LIBRARIES "zlib" DOC "Path to zlib library")
|
||||
|
||||
# Dll's are automatically copied to the output directory by vcpkg when VCPKG_APPLOCAL_DEPS=ON
|
||||
if(NOT VCPKG_APPLOCAL_DEPS)
|
||||
find_file(ZLIB_DLL NAMES "zlib.dll" "zlib1.dll" DOC "Path to zlib.dll for installation (optional)")
|
||||
if(ENABLE_SOUND)
|
||||
set(OPENAL_DLL "" CACHE FILEPATH "Path to OpenAL32.dll for installation (optional)")
|
||||
set(OGG_DLL "" CACHE FILEPATH "Path to libogg.dll for installation (optional)")
|
||||
|
@ -277,6 +266,8 @@ if(WIN32)
|
|||
if(USE_LUAJIT)
|
||||
set(LUA_DLL "" CACHE FILEPATH "Path to lua51.dll for installation (optional)")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
else()
|
||||
# Unix probably
|
||||
if(BUILD_CLIENT)
|
||||
|
@ -703,12 +694,6 @@ else()
|
|||
set(OTHER_FLAGS "${OTHER_FLAGS} -Wsign-compare")
|
||||
endif()
|
||||
|
||||
if(WIN32 AND NOT ZLIBWAPI_DLL AND CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
set(OTHER_FLAGS "${OTHER_FLAGS} -DWIN32_NO_ZLIB_WINAPI")
|
||||
message(WARNING "Defaulting to cdecl for zlib on win32 because ZLIBWAPI_DLL"
|
||||
" isn't set, ensure that ZLIBWAPI_DLL is set if you want stdcall.")
|
||||
endif()
|
||||
|
||||
if(MINGW)
|
||||
set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_LEAN_AND_MEAN")
|
||||
|
@ -736,6 +721,26 @@ endif()
|
|||
# Installation
|
||||
|
||||
if(WIN32)
|
||||
if(VCPKG_APPLOCAL_DEPS)
|
||||
# Collect the dll's from the output path
|
||||
install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Release/
|
||||
DESTINATION ${BINDIR}
|
||||
CONFIGURATIONS Release
|
||||
FILES_MATCHING PATTERN "*.dll")
|
||||
install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/Debug/
|
||||
DESTINATION ${BINDIR}
|
||||
CONFIGURATIONS Debug
|
||||
FILES_MATCHING PATTERN "*.dll")
|
||||
install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/RelWithDebInfo/
|
||||
DESTINATION ${BINDIR}
|
||||
CONFIGURATIONS RelWithDebInfo
|
||||
FILES_MATCHING PATTERN "*.dll")
|
||||
install(DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/MinSizeRel/
|
||||
DESTINATION ${BINDIR}
|
||||
CONFIGURATIONS RelWithDebInfo
|
||||
FILES_MATCHING PATTERN "*.dll")
|
||||
else()
|
||||
# Use the old-style way to install dll's
|
||||
if(USE_SOUND)
|
||||
if(OPENAL_DLL)
|
||||
install(FILES ${OPENAL_DLL} DESTINATION ${BINDIR})
|
||||
|
@ -756,9 +761,6 @@ if(WIN32)
|
|||
if(ZLIB_DLL)
|
||||
install(FILES ${ZLIB_DLL} DESTINATION ${BINDIR})
|
||||
endif()
|
||||
if(ZLIBWAPI_DLL)
|
||||
install(FILES ${ZLIBWAPI_DLL} DESTINATION ${BINDIR})
|
||||
endif()
|
||||
if(FREETYPE_DLL)
|
||||
install(FILES ${FREETYPE_DLL} DESTINATION ${BINDIR})
|
||||
endif()
|
||||
|
@ -772,6 +774,7 @@ if(WIN32)
|
|||
install(FILES ${LUA_DLL} DESTINATION ${BINDIR})
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(BUILD_CLIENT)
|
||||
install(TARGETS ${PROJECT_NAME}
|
||||
|
@ -806,6 +809,7 @@ if(BUILD_CLIENT)
|
|||
endif()
|
||||
|
||||
if(WIN32)
|
||||
if(NOT VCPKG_APPLOCAL_DEPS)
|
||||
if(DEFINED IRRLICHT_DLL)
|
||||
install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
|
||||
endif()
|
||||
|
@ -818,6 +822,7 @@ if(BUILD_CLIENT)
|
|||
endif()
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
endif(BUILD_CLIENT)
|
||||
|
||||
if(BUILD_SERVER)
|
||||
|
|
|
@ -827,10 +827,6 @@ private:
|
|||
|
||||
ChatBackend *chat_backend = nullptr;
|
||||
|
||||
GUIFormSpecMenu *current_formspec = nullptr;
|
||||
//default: "". If other than "", empty show_formspec packets will only close the formspec when the formname matches
|
||||
std::string cur_formname;
|
||||
|
||||
EventManager *eventmgr = nullptr;
|
||||
QuicktuneShortcutter *quicktune = nullptr;
|
||||
bool registration_confirmation_shown = false;
|
||||
|
@ -1143,8 +1139,9 @@ void Game::shutdown()
|
|||
driver->setRenderTarget(irr::video::ERT_STEREO_BOTH_BUFFERS);
|
||||
}
|
||||
#endif
|
||||
if (current_formspec)
|
||||
current_formspec->quitMenu();
|
||||
auto formspec = m_game_ui->getFormspecGUI();
|
||||
if (formspec)
|
||||
formspec->quitMenu();
|
||||
|
||||
showOverlayMessage(N_("Shutting down..."), 0, 0, false);
|
||||
|
||||
|
@ -1163,10 +1160,7 @@ void Game::shutdown()
|
|||
g_menumgr.deletingMenu(g_menumgr.m_stack.front());
|
||||
}
|
||||
|
||||
if (current_formspec) {
|
||||
current_formspec->drop();
|
||||
current_formspec = NULL;
|
||||
}
|
||||
m_game_ui->deleteFormspec();
|
||||
|
||||
chat_backend->addMessage(L"", L"# Disconnected.");
|
||||
chat_backend->addMessage(L"", L"");
|
||||
|
@ -1853,8 +1847,9 @@ void Game::processUserInput(f32 dtime)
|
|||
input->step(dtime);
|
||||
|
||||
#ifdef __ANDROID__
|
||||
if (current_formspec != NULL)
|
||||
current_formspec->getAndroidUIInput();
|
||||
auto formspec = m_game_ui->getFormspecGUI();
|
||||
if (formspec)
|
||||
formspec->getAndroidUIInput();
|
||||
else
|
||||
handleAndroidChatInput();
|
||||
#endif
|
||||
|
@ -2050,10 +2045,11 @@ void Game::openInventory()
|
|||
if (!client->moddingEnabled()
|
||||
|| !client->getScript()->on_inventory_open(fs_src->m_client->getInventory(inventoryloc))) {
|
||||
TextDest *txt_dst = new TextDestPlayerInventory(client);
|
||||
GUIFormSpecMenu::create(current_formspec, client, &input->joystick, fs_src,
|
||||
auto *&formspec = m_game_ui->updateFormspec("");
|
||||
GUIFormSpecMenu::create(formspec, client, &input->joystick, fs_src,
|
||||
txt_dst, client->getFormspecPrepend());
|
||||
cur_formname = "";
|
||||
current_formspec->setFormSpec(fs_src->getForm(), inventoryloc);
|
||||
|
||||
formspec->setFormSpec(fs_src->getForm(), inventoryloc);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2581,9 +2577,10 @@ void Game::handleClientEvent_Deathscreen(ClientEvent *event, CameraOrientation *
|
|||
void Game::handleClientEvent_ShowFormSpec(ClientEvent *event, CameraOrientation *cam)
|
||||
{
|
||||
if (event->show_formspec.formspec->empty()) {
|
||||
if (current_formspec && (event->show_formspec.formname->empty()
|
||||
|| *(event->show_formspec.formname) == cur_formname)) {
|
||||
current_formspec->quitMenu();
|
||||
auto formspec = m_game_ui->getFormspecGUI();
|
||||
if (formspec && (event->show_formspec.formname->empty()
|
||||
|| *(event->show_formspec.formname) == m_game_ui->getFormspecName())) {
|
||||
formspec->quitMenu();
|
||||
}
|
||||
} else {
|
||||
FormspecFormSource *fs_src =
|
||||
|
@ -2591,9 +2588,9 @@ void Game::handleClientEvent_ShowFormSpec(ClientEvent *event, CameraOrientation
|
|||
TextDestPlayerInventory *txt_dst =
|
||||
new TextDestPlayerInventory(client, *(event->show_formspec.formname));
|
||||
|
||||
GUIFormSpecMenu::create(current_formspec, client, &input->joystick,
|
||||
auto *&formspec = m_game_ui->updateFormspec(*(event->show_formspec.formname));
|
||||
GUIFormSpecMenu::create(formspec, client, &input->joystick,
|
||||
fs_src, txt_dst, client->getFormspecPrepend());
|
||||
cur_formname = *(event->show_formspec.formname);
|
||||
}
|
||||
|
||||
delete event->show_formspec.formspec;
|
||||
|
@ -2605,7 +2602,7 @@ void Game::handleClientEvent_ShowLocalFormSpec(ClientEvent *event, CameraOrienta
|
|||
FormspecFormSource *fs_src = new FormspecFormSource(*event->show_formspec.formspec);
|
||||
LocalFormspecHandler *txt_dst =
|
||||
new LocalFormspecHandler(*event->show_formspec.formname, client);
|
||||
GUIFormSpecMenu::create(current_formspec, client, &input->joystick,
|
||||
GUIFormSpecMenu::create(m_game_ui->getFormspecGUI(), client, &input->joystick,
|
||||
fs_src, txt_dst, client->getFormspecPrepend());
|
||||
|
||||
delete event->show_formspec.formspec;
|
||||
|
@ -3272,11 +3269,11 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
|
|||
&client->getEnv().getClientMap(), nodepos);
|
||||
TextDest *txt_dst = new TextDestNodeMetadata(nodepos, client);
|
||||
|
||||
GUIFormSpecMenu::create(current_formspec, client, &input->joystick, fs_src,
|
||||
auto *&formspec = m_game_ui->updateFormspec("");
|
||||
GUIFormSpecMenu::create(formspec, client, &input->joystick, fs_src,
|
||||
txt_dst, client->getFormspecPrepend());
|
||||
cur_formname.clear();
|
||||
|
||||
current_formspec->setFormSpec(meta->getString("formspec"), inventoryloc);
|
||||
formspec->setFormSpec(meta->getString("formspec"), inventoryloc);
|
||||
} else {
|
||||
// Report right click to server
|
||||
|
||||
|
@ -3844,15 +3841,29 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
|
|||
1. Delete formspec menu reference if menu was removed
|
||||
2. Else, make sure formspec menu is on top
|
||||
*/
|
||||
if (current_formspec) {
|
||||
if (current_formspec->getReferenceCount() == 1) {
|
||||
current_formspec->drop();
|
||||
current_formspec = NULL;
|
||||
} else if (isMenuActive()) {
|
||||
guiroot->bringToFront(current_formspec);
|
||||
auto formspec = m_game_ui->getFormspecGUI();
|
||||
do { // breakable. only runs for one iteration
|
||||
if (!formspec)
|
||||
break;
|
||||
|
||||
if (formspec->getReferenceCount() == 1) {
|
||||
m_game_ui->deleteFormspec();
|
||||
break;
|
||||
}
|
||||
|
||||
auto &loc = formspec->getFormspecLocation();
|
||||
if (loc.type == InventoryLocation::NODEMETA) {
|
||||
NodeMetadata *meta = client->getEnv().getClientMap().getNodeMetadata(loc.p);
|
||||
if (!meta || meta->getString("formspec").empty()) {
|
||||
formspec->quitMenu();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (isMenuActive())
|
||||
guiroot->bringToFront(formspec);
|
||||
} while (false);
|
||||
|
||||
/*
|
||||
Drawing begins
|
||||
*/
|
||||
|
@ -4048,7 +4059,7 @@ void Game::extendedResourceCleanup()
|
|||
|
||||
void Game::showDeathFormspec()
|
||||
{
|
||||
static std::string formspec =
|
||||
static std::string formspec_str =
|
||||
std::string(FORMSPEC_VERSION_STRING) +
|
||||
SIZE_TAG
|
||||
"bgcolor[#320000b4;true]"
|
||||
|
@ -4059,12 +4070,13 @@ void Game::showDeathFormspec()
|
|||
/* Create menu */
|
||||
/* Note: FormspecFormSource and LocalFormspecHandler *
|
||||
* are deleted by guiFormSpecMenu */
|
||||
FormspecFormSource *fs_src = new FormspecFormSource(formspec);
|
||||
FormspecFormSource *fs_src = new FormspecFormSource(formspec_str);
|
||||
LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_DEATH_SCREEN", client);
|
||||
|
||||
GUIFormSpecMenu::create(current_formspec, client, &input->joystick, fs_src,
|
||||
txt_dst, client->getFormspecPrepend());
|
||||
current_formspec->setFocus("btn_respawn");
|
||||
auto *&formspec = m_game_ui->getFormspecGUI();
|
||||
GUIFormSpecMenu::create(formspec, client, &input->joystick,
|
||||
fs_src, txt_dst, client->getFormspecPrepend());
|
||||
formspec->setFocus("btn_respawn");
|
||||
}
|
||||
|
||||
#define GET_KEY_NAME(KEY) gettext(getKeySetting(#KEY).name())
|
||||
|
@ -4188,10 +4200,11 @@ void Game::showPauseMenu()
|
|||
FormspecFormSource *fs_src = new FormspecFormSource(os.str());
|
||||
LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_PAUSE_MENU");
|
||||
|
||||
GUIFormSpecMenu::create(current_formspec, client, &input->joystick,
|
||||
auto *&formspec = m_game_ui->getFormspecGUI();
|
||||
GUIFormSpecMenu::create(formspec, client, &input->joystick,
|
||||
fs_src, txt_dst, client->getFormspecPrepend());
|
||||
current_formspec->setFocus("btn_continue");
|
||||
current_formspec->doPause = true;
|
||||
formspec->setFocus("btn_continue");
|
||||
formspec->doPause = true;
|
||||
}
|
||||
|
||||
/****************************************************************************/
|
||||
|
|
|
@ -302,3 +302,15 @@ void GameUI::toggleProfiler()
|
|||
showTranslatedStatusText("Profiler hidden");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void GameUI::deleteFormspec()
|
||||
{
|
||||
if (m_formspec)
|
||||
m_formspec->quitMenu();
|
||||
|
||||
delete m_formspec;
|
||||
m_formspec = nullptr;
|
||||
|
||||
m_formname.clear();
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#pragma once
|
||||
|
||||
#include <IGUIEnvironment.h>
|
||||
#include "gui/guiFormSpecMenu.h"
|
||||
#include "util/enriched_string.h"
|
||||
#include "util/pointedthing.h"
|
||||
#include "game.h"
|
||||
|
@ -88,6 +89,16 @@ public:
|
|||
void toggleHud();
|
||||
void toggleProfiler();
|
||||
|
||||
GUIFormSpecMenu *&updateFormspec(const std::string &formname)
|
||||
{
|
||||
m_formname = formname;
|
||||
return m_formspec;
|
||||
}
|
||||
|
||||
const std::string &getFormspecName() { return m_formname; }
|
||||
GUIFormSpecMenu *&getFormspecGUI() { return m_formspec; }
|
||||
void deleteFormspec();
|
||||
|
||||
private:
|
||||
Flags m_flags;
|
||||
|
||||
|
@ -107,4 +118,9 @@ private:
|
|||
gui::IGUIStaticText *m_guitext_profiler = nullptr; // Profiler text
|
||||
u8 m_profiler_current_page = 0;
|
||||
const u8 m_profiler_max_page = 3;
|
||||
|
||||
// Default: "". If other than "": Empty show_formspec packets will only
|
||||
// close the formspec when the formname matches
|
||||
std::string m_formname;
|
||||
GUIFormSpecMenu *m_formspec = nullptr;
|
||||
};
|
||||
|
|
|
@ -170,8 +170,8 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
|
|||
std::vector<CollisionInfo> *collision_info)
|
||||
{
|
||||
if (!collision_info || collision_info->empty()) {
|
||||
// Node below the feet, update each ClientEnvironment::step()
|
||||
m_standing_node = floatToInt(m_position, BS) - v3s16(0, 1, 0);
|
||||
// Node at feet position, update each ClientEnvironment::step()
|
||||
m_standing_node = floatToInt(m_position, BS);
|
||||
}
|
||||
|
||||
// Temporary option for old move code
|
||||
|
@ -309,7 +309,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
|
|||
collision_info->push_back(colinfo);
|
||||
|
||||
if (colinfo.type != COLLISION_NODE ||
|
||||
colinfo.new_speed.Y != 0 ||
|
||||
colinfo.axis != COLLISION_AXIS_Y ||
|
||||
(could_sneak && m_sneak_node_exists))
|
||||
continue;
|
||||
|
||||
|
@ -320,6 +320,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
|
|||
if (is_first || len < distance) {
|
||||
m_standing_node = colinfo.node_p;
|
||||
distance = len;
|
||||
is_first = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -435,11 +436,11 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
|
|||
Check properties of the node on which the player is standing
|
||||
*/
|
||||
const ContentFeatures &f = nodemgr->get(map->getNodeNoEx(m_standing_node));
|
||||
|
||||
// Determine if jumping is possible
|
||||
m_can_jump = (touching_ground && !in_liquid && !is_climbing)
|
||||
|| sneak_can_jump;
|
||||
if (itemgroup_get(f.groups, "disable_jump"))
|
||||
m_can_jump = false;
|
||||
m_disable_jump = itemgroup_get(f.groups, "disable_jump");
|
||||
m_can_jump = ((touching_ground && !is_climbing)
|
||||
|| sneak_can_jump) && !m_disable_jump;
|
||||
|
||||
// Jump key pressed while jumping off from a bouncy block
|
||||
if (m_can_jump && control.jump && itemgroup_get(f.groups, "bouncy") &&
|
||||
|
@ -636,17 +637,13 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
|
|||
setSpeed(speedJ);
|
||||
m_client->getEventManager()->put(new SimpleTriggerEvent(MtEvent::PLAYER_JUMP));
|
||||
}
|
||||
}
|
||||
else if(in_liquid)
|
||||
{
|
||||
} else if (in_liquid && !m_disable_jump) {
|
||||
if (fast_climb)
|
||||
speedV.Y = movement_speed_fast;
|
||||
else
|
||||
speedV.Y = movement_speed_walk;
|
||||
swimming_vertical = true;
|
||||
}
|
||||
else if(is_climbing)
|
||||
{
|
||||
} else if (is_climbing && !m_disable_jump) {
|
||||
if (fast_climb)
|
||||
speedV.Y = movement_speed_fast;
|
||||
else
|
||||
|
@ -908,6 +905,12 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
|
|||
pos_max_d, m_collisionbox, player_stepheight, dtime,
|
||||
&position, &m_speed, accel_f);
|
||||
|
||||
// Positition was slightly changed; update standing node pos
|
||||
if (touching_ground)
|
||||
m_standing_node = floatToInt(m_position - v3f(0, 0.1f * BS, 0), BS);
|
||||
else
|
||||
m_standing_node = floatToInt(m_position, BS);
|
||||
|
||||
/*
|
||||
If the player's feet touch the topside of any node, this is
|
||||
set to true.
|
||||
|
@ -1048,11 +1051,13 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
|
|||
/*
|
||||
Check properties of the node on which the player is standing
|
||||
*/
|
||||
const ContentFeatures &f = nodemgr->get(map->getNodeNoEx(getStandingNodePos()));
|
||||
const ContentFeatures &f = nodemgr->get(map->getNodeNoEx(
|
||||
getStandingNodePos()));
|
||||
|
||||
// Determine if jumping is possible
|
||||
m_can_jump = touching_ground && !in_liquid;
|
||||
if (itemgroup_get(f.groups, "disable_jump"))
|
||||
m_can_jump = false;
|
||||
m_disable_jump = itemgroup_get(f.groups, "disable_jump");
|
||||
m_can_jump = touching_ground && !m_disable_jump;
|
||||
|
||||
// Jump key pressed while jumping off from a bouncy block
|
||||
if (m_can_jump && control.jump && itemgroup_get(f.groups, "bouncy") &&
|
||||
m_speed.Y >= -0.5 * BS) {
|
||||
|
|
|
@ -183,6 +183,7 @@ private:
|
|||
// ***** End of variables for temporary option *****
|
||||
|
||||
bool m_can_jump = false;
|
||||
bool m_disable_jump = false;
|
||||
u16 m_breath = PLAYER_MAX_BREATH_DEFAULT;
|
||||
f32 m_yaw = 0.0f;
|
||||
f32 m_pitch = 0.0f;
|
||||
|
|
|
@ -59,7 +59,7 @@ struct NearbyCollisionInfo {
|
|||
// Checks for collision of a moving aabbox with a static aabbox
|
||||
// Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision
|
||||
// The time after which the collision occurs is stored in dtime.
|
||||
int axisAlignedCollision(
|
||||
CollisionAxis axisAlignedCollision(
|
||||
const aabb3f &staticbox, const aabb3f &movingbox,
|
||||
const v3f &speed, f32 d, f32 *dtime)
|
||||
{
|
||||
|
@ -86,11 +86,11 @@ int axisAlignedCollision(
|
|||
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO) &&
|
||||
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
||||
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
||||
return 0;
|
||||
return COLLISION_AXIS_X;
|
||||
}
|
||||
else if(relbox.MinEdge.X > xsize)
|
||||
{
|
||||
return -1;
|
||||
return COLLISION_AXIS_NONE;
|
||||
}
|
||||
}
|
||||
else if(speed.X < 0) // Check for collision with X+ plane
|
||||
|
@ -101,11 +101,11 @@ int axisAlignedCollision(
|
|||
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO) &&
|
||||
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
||||
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
||||
return 0;
|
||||
return COLLISION_AXIS_X;
|
||||
}
|
||||
else if(relbox.MaxEdge.X < 0)
|
||||
{
|
||||
return -1;
|
||||
return COLLISION_AXIS_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -119,11 +119,11 @@ int axisAlignedCollision(
|
|||
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
||||
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
||||
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
||||
return 1;
|
||||
return COLLISION_AXIS_Y;
|
||||
}
|
||||
else if(relbox.MinEdge.Y > ysize)
|
||||
{
|
||||
return -1;
|
||||
return COLLISION_AXIS_NONE;
|
||||
}
|
||||
}
|
||||
else if(speed.Y < 0) // Check for collision with Y+ plane
|
||||
|
@ -134,11 +134,11 @@ int axisAlignedCollision(
|
|||
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
||||
(relbox.MinEdge.Z + speed.Z * (*dtime) < zsize) &&
|
||||
(relbox.MaxEdge.Z + speed.Z * (*dtime) > COLL_ZERO))
|
||||
return 1;
|
||||
return COLLISION_AXIS_Y;
|
||||
}
|
||||
else if(relbox.MaxEdge.Y < 0)
|
||||
{
|
||||
return -1;
|
||||
return COLLISION_AXIS_NONE;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -152,11 +152,11 @@ int axisAlignedCollision(
|
|||
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
||||
(relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) &&
|
||||
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO))
|
||||
return 2;
|
||||
return COLLISION_AXIS_Z;
|
||||
}
|
||||
//else if(relbox.MinEdge.Z > zsize)
|
||||
//{
|
||||
// return -1;
|
||||
// return COLLISION_AXIS_NONE;
|
||||
//}
|
||||
}
|
||||
else if(speed.Z < 0) // Check for collision with Z+ plane
|
||||
|
@ -167,15 +167,15 @@ int axisAlignedCollision(
|
|||
(relbox.MaxEdge.X + speed.X * (*dtime) > COLL_ZERO) &&
|
||||
(relbox.MinEdge.Y + speed.Y * (*dtime) < ysize) &&
|
||||
(relbox.MaxEdge.Y + speed.Y * (*dtime) > COLL_ZERO))
|
||||
return 2;
|
||||
return COLLISION_AXIS_Z;
|
||||
}
|
||||
//else if(relbox.MaxEdge.Z < 0)
|
||||
//{
|
||||
// return -1;
|
||||
// return COLLISION_AXIS_NONE;
|
||||
//}
|
||||
}
|
||||
|
||||
return -1;
|
||||
return COLLISION_AXIS_NONE;
|
||||
}
|
||||
|
||||
// Helper function:
|
||||
|
@ -442,7 +442,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
movingbox.MinEdge += *pos_f;
|
||||
movingbox.MaxEdge += *pos_f;
|
||||
|
||||
int nearest_collided = -1;
|
||||
CollisionAxis nearest_collided = COLLISION_AXIS_NONE;
|
||||
f32 nearest_dtime = dtime;
|
||||
int nearest_boxindex = -1;
|
||||
|
||||
|
@ -457,7 +457,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
|
||||
// Find nearest collision of the two boxes (raytracing-like)
|
||||
f32 dtime_tmp;
|
||||
int collided = axisAlignedCollision(box_info.box,
|
||||
CollisionAxis collided = axisAlignedCollision(box_info.box,
|
||||
movingbox, *speed_f, d, &dtime_tmp);
|
||||
|
||||
if (collided == -1 || dtime_tmp >= nearest_dtime)
|
||||
|
@ -468,7 +468,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
nearest_boxindex = boxindex;
|
||||
}
|
||||
|
||||
if (nearest_collided == -1) {
|
||||
if (nearest_collided == COLLISION_AXIS_NONE) {
|
||||
// No collision with any collision box.
|
||||
*pos_f += *speed_f * dtime;
|
||||
dtime = 0; // Set to 0 to avoid "infinite" loop due to small FP numbers
|
||||
|
@ -477,7 +477,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
NearbyCollisionInfo &nearest_info = cinfo[nearest_boxindex];
|
||||
const aabb3f& cbox = nearest_info.box;
|
||||
// Check for stairs.
|
||||
bool step_up = (nearest_collided != 1) && // must not be Y direction
|
||||
bool step_up = (nearest_collided != COLLISION_AXIS_Y) && // must not be Y direction
|
||||
(movingbox.MinEdge.Y < cbox.MaxEdge.Y) &&
|
||||
(movingbox.MinEdge.Y + stepheight > cbox.MaxEdge.Y) &&
|
||||
(!wouldCollideWithCeiling(cinfo, movingbox,
|
||||
|
@ -491,11 +491,11 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
if (nearest_dtime < 0) {
|
||||
// Handle negative nearest_dtime (can be caused by the d allowance)
|
||||
if (!step_up) {
|
||||
if (nearest_collided == 0)
|
||||
if (nearest_collided == COLLISION_AXIS_X)
|
||||
pos_f->X += speed_f->X * nearest_dtime;
|
||||
if (nearest_collided == 1)
|
||||
if (nearest_collided == COLLISION_AXIS_Y)
|
||||
pos_f->Y += speed_f->Y * nearest_dtime;
|
||||
if (nearest_collided == 2)
|
||||
if (nearest_collided == COLLISION_AXIS_Z)
|
||||
pos_f->Z += speed_f->Z * nearest_dtime;
|
||||
}
|
||||
} else {
|
||||
|
@ -522,19 +522,19 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
// Special case: Handle stairs
|
||||
nearest_info.is_step_up = true;
|
||||
is_collision = false;
|
||||
} else if (nearest_collided == 0) { // X
|
||||
} else if (nearest_collided == COLLISION_AXIS_X) {
|
||||
if (fabs(speed_f->X) > BS * 3)
|
||||
speed_f->X *= bounce;
|
||||
else
|
||||
speed_f->X = 0;
|
||||
result.collides = true;
|
||||
} else if (nearest_collided == 1) { // Y
|
||||
} else if (nearest_collided == COLLISION_AXIS_Y) {
|
||||
if(fabs(speed_f->Y) > BS * 3)
|
||||
speed_f->Y *= bounce;
|
||||
else
|
||||
speed_f->Y = 0;
|
||||
result.collides = true;
|
||||
} else if (nearest_collided == 2) { // Z
|
||||
} else if (nearest_collided == COLLISION_AXIS_Z) {
|
||||
if (fabs(speed_f->Z) > BS * 3)
|
||||
speed_f->Z *= bounce;
|
||||
else
|
||||
|
@ -547,6 +547,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
|
|||
is_collision = false;
|
||||
|
||||
if (is_collision) {
|
||||
info.axis = nearest_collided;
|
||||
result.collisions.push_back(info);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -33,11 +33,20 @@ enum CollisionType
|
|||
COLLISION_OBJECT,
|
||||
};
|
||||
|
||||
enum CollisionAxis
|
||||
{
|
||||
COLLISION_AXIS_NONE = -1,
|
||||
COLLISION_AXIS_X,
|
||||
COLLISION_AXIS_Y,
|
||||
COLLISION_AXIS_Z,
|
||||
};
|
||||
|
||||
struct CollisionInfo
|
||||
{
|
||||
CollisionInfo() = default;
|
||||
|
||||
CollisionType type = COLLISION_NODE;
|
||||
CollisionAxis axis = COLLISION_AXIS_NONE;
|
||||
v3s16 node_p = v3s16(-32768,-32768,-32768); // COLLISION_NODE
|
||||
v3f old_speed;
|
||||
v3f new_speed;
|
||||
|
@ -66,7 +75,7 @@ collisionMoveResult collisionMoveSimple(Environment *env,IGameDef *gamedef,
|
|||
// Checks for collision of a moving aabbox with a static aabbox
|
||||
// Returns -1 if no collision, 0 if X collision, 1 if Y collision, 2 if Z collision
|
||||
// dtime receives time until first collision, invalid if -1 is returned
|
||||
int axisAlignedCollision(
|
||||
CollisionAxis axisAlignedCollision(
|
||||
const aabb3f &staticbox, const aabb3f &movingbox,
|
||||
const v3f &speed, f32 d, f32 *dtime);
|
||||
|
||||
|
|
|
@ -633,17 +633,15 @@ int LuaEntitySAO::punch(v3f dir,
|
|||
return 0;
|
||||
}
|
||||
|
||||
ItemStack *punchitem = NULL;
|
||||
ItemStack punchitem_static;
|
||||
if (puncher) {
|
||||
punchitem_static = puncher->getWieldedItem();
|
||||
punchitem = &punchitem_static;
|
||||
}
|
||||
FATAL_ERROR_IF(!puncher, "Punch action called without SAO");
|
||||
|
||||
s32 old_hp = getHP();
|
||||
const ItemStack &punchitem = puncher->getWieldedItem();
|
||||
|
||||
PunchDamageResult result = getPunchDamage(
|
||||
m_armor_groups,
|
||||
toolcap,
|
||||
punchitem,
|
||||
&punchitem,
|
||||
time_from_last_punch);
|
||||
|
||||
bool damage_handled = m_env->getScriptIface()->luaentity_Punch(m_id, puncher,
|
||||
|
@ -654,14 +652,6 @@ int LuaEntitySAO::punch(v3f dir,
|
|||
setHP((s32)getHP() - result.damage,
|
||||
PlayerHPChangeReason(PlayerHPChangeReason::SET_HP));
|
||||
|
||||
if (result.damage > 0) {
|
||||
std::string punchername = puncher ? puncher->getDescription() : "nil";
|
||||
|
||||
actionstream << getDescription() << " punched by "
|
||||
<< punchername << ", damage " << result.damage
|
||||
<< " hp, health now " << getHP() << " hp" << std::endl;
|
||||
}
|
||||
|
||||
std::string str = gob_cmd_punched(getHP());
|
||||
// create message and add to list
|
||||
ActiveObjectMessage aom(getId(), true, str);
|
||||
|
@ -676,6 +666,12 @@ int LuaEntitySAO::punch(v3f dir,
|
|||
m_env->getScriptIface()->luaentity_on_death(m_id, puncher);
|
||||
}
|
||||
|
||||
actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
|
||||
", hp=" << puncher->getHP() << ") punched " <<
|
||||
getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
|
||||
"), damage=" << (old_hp - (s32)getHP()) <<
|
||||
(damage_handled ? " (handled by Lua)" : "") << std::endl;
|
||||
|
||||
return result.wear;
|
||||
}
|
||||
|
||||
|
@ -893,6 +889,9 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t p
|
|||
m_breath = m_prop.breath_max;
|
||||
// Disable zoom in survival mode using a value of 0
|
||||
m_prop.zoom_fov = g_settings->getBool("creative_mode") ? 15.0f : 0.0f;
|
||||
|
||||
if (!g_settings->getBool("enable_damage"))
|
||||
m_armor_groups["immortal"] = 1;
|
||||
}
|
||||
|
||||
PlayerSAO::~PlayerSAO()
|
||||
|
@ -995,7 +994,7 @@ void PlayerSAO::getStaticData(std::string * result) const
|
|||
|
||||
void PlayerSAO::step(float dtime, bool send_recommended)
|
||||
{
|
||||
if (m_drowning_interval.step(dtime, 2.0f)) {
|
||||
if (!isImmortal() && m_drowning_interval.step(dtime, 2.0f)) {
|
||||
// Get nose/mouth position, approximate with eye position
|
||||
v3s16 p = floatToInt(getEyePosition(), BS);
|
||||
MapNode n = m_env->getMap().getNodeNoEx(p);
|
||||
|
@ -1025,7 +1024,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
|
|||
setBreath(m_breath + 1);
|
||||
}
|
||||
|
||||
if (m_node_hurt_interval.step(dtime, 1.0f)) {
|
||||
if (!isImmortal() && m_node_hurt_interval.step(dtime, 1.0f)) {
|
||||
u32 damage_per_second = 0;
|
||||
std::string nodename;
|
||||
// Lowest and highest damage points are 0.1 within collisionbox
|
||||
|
@ -1284,6 +1283,8 @@ int PlayerSAO::punch(v3f dir,
|
|||
if (!toolcap)
|
||||
return 0;
|
||||
|
||||
FATAL_ERROR_IF(!puncher, "Punch action called without SAO");
|
||||
|
||||
// No effect if PvP disabled
|
||||
if (!g_settings->getBool("enable_pvp")) {
|
||||
if (puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {
|
||||
|
@ -1295,14 +1296,10 @@ int PlayerSAO::punch(v3f dir,
|
|||
}
|
||||
}
|
||||
|
||||
s32 old_hp = getHP();
|
||||
HitParams hitparams = getHitParams(m_armor_groups, toolcap,
|
||||
time_from_last_punch);
|
||||
|
||||
std::string punchername = "nil";
|
||||
|
||||
if (puncher != 0)
|
||||
punchername = puncher->getDescription();
|
||||
|
||||
PlayerSAO *playersao = m_player->getPlayerSAO();
|
||||
|
||||
bool damage_handled = m_env->getScriptIface()->on_punchplayer(playersao,
|
||||
|
@ -1321,15 +1318,11 @@ int PlayerSAO::punch(v3f dir,
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
actionstream << "Player " << m_player->getName() << " punched by "
|
||||
<< punchername;
|
||||
if (!damage_handled) {
|
||||
actionstream << ", damage " << hitparams.hp << " HP";
|
||||
} else {
|
||||
actionstream << ", damage handled by lua";
|
||||
}
|
||||
actionstream << std::endl;
|
||||
actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
|
||||
", hp=" << puncher->getHP() << ") punched " <<
|
||||
getDescription() << " (id=" << m_id << ", hp=" << m_hp <<
|
||||
"), damage=" << (old_hp - (s32)getHP()) <<
|
||||
(damage_handled ? " (handled by Lua)" : "") << std::endl;
|
||||
|
||||
return hitparams.wear;
|
||||
}
|
||||
|
@ -1348,7 +1341,7 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
|
|||
hp = rangelim(oldhp + hp_change, 0, m_prop.hp_max);
|
||||
}
|
||||
|
||||
if (hp < oldhp && !g_settings->getBool("enable_damage"))
|
||||
if (hp < oldhp && isImmortal())
|
||||
return;
|
||||
|
||||
m_hp = hp;
|
||||
|
|
|
@ -45,6 +45,8 @@ public:
|
|||
|
||||
inline bool isAttached() const
|
||||
{ return getParent(); }
|
||||
inline bool isImmortal() const
|
||||
{ return itemgroup_get(m_armor_groups, "immortal"); }
|
||||
|
||||
void setArmorGroups(const ItemGroupList &armor_groups);
|
||||
const ItemGroupList &getArmorGroups();
|
||||
|
|
|
@ -304,6 +304,11 @@ public:
|
|||
regenerateGui(m_screensize_old);
|
||||
}
|
||||
|
||||
const InventoryLocation &getFormspecLocation()
|
||||
{
|
||||
return m_current_inventory_location;
|
||||
}
|
||||
|
||||
void setFormspecPrepend(const std::string &formspecPrepend)
|
||||
{
|
||||
m_formspec_prepend = formspecPrepend;
|
||||
|
|
|
@ -799,7 +799,7 @@ void Server::handleCommand_Damage(NetworkPacket* pkt)
|
|||
return;
|
||||
}
|
||||
|
||||
if (g_settings->getBool("enable_damage")) {
|
||||
if (!playersao->isImmortal()) {
|
||||
if (playersao->isDead()) {
|
||||
verbosestream << "Server::ProcessData(): Info: "
|
||||
"Ignoring damage as player " << player->getName()
|
||||
|
@ -1156,10 +1156,6 @@ void Server::handleCommand_Interact(NetworkPacket* pkt)
|
|||
if (pointed_object->isGone())
|
||||
return;
|
||||
|
||||
actionstream<<player->getName()<<" punches object "
|
||||
<<pointed.object_id<<": "
|
||||
<<pointed_object->getDescription()<<std::endl;
|
||||
|
||||
ItemStack punchitem = playersao->getWieldedItemOrHand();
|
||||
ToolCapabilities toolcap =
|
||||
punchitem.getToolCapabilities(m_itemdef);
|
||||
|
|
|
@ -20,9 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#include "serialization.h"
|
||||
|
||||
#include "util/serialize.h"
|
||||
#if defined(_WIN32) && !defined(WIN32_NO_ZLIB_WINAPI)
|
||||
#define ZLIB_WINAPI
|
||||
#endif
|
||||
|
||||
#include "zlib.h"
|
||||
|
||||
/* report a zlib or i/o error */
|
||||
|
|
|
@ -1426,7 +1426,7 @@ void Server::SendMovement(session_t peer_id)
|
|||
|
||||
void Server::SendPlayerHPOrDie(PlayerSAO *playersao, const PlayerHPChangeReason &reason)
|
||||
{
|
||||
if (!g_settings->getBool("enable_damage"))
|
||||
if (playersao->isImmortal())
|
||||
return;
|
||||
|
||||
session_t peer_id = playersao->getPeerID();
|
||||
|
|
Loading…
Reference in New Issue