forked from Mirrorlandia_minetest/minetest
Move client-specific files to 'src/client' (#7902)
Update Android.mk Remove 'src/client' from include_directories
This commit is contained in:
parent
ddd9317b73
commit
5f1cd555cd
2
.gitignore
vendored
2
.gitignore
vendored
@ -56,6 +56,7 @@ debug.txt
|
|||||||
|
|
||||||
## Other files generated by minetest
|
## Other files generated by minetest
|
||||||
screenshot_*.png
|
screenshot_*.png
|
||||||
|
testbm.txt
|
||||||
|
|
||||||
## Doxygen files
|
## Doxygen files
|
||||||
doc/Doxyfile
|
doc/Doxyfile
|
||||||
@ -95,6 +96,7 @@ cmake-build-release/
|
|||||||
cmake_config.h
|
cmake_config.h
|
||||||
cmake_config_githash.h
|
cmake_config_githash.h
|
||||||
CMakeDoxy*
|
CMakeDoxy*
|
||||||
|
compile_commands.json
|
||||||
|
|
||||||
## Android build files
|
## Android build files
|
||||||
build/android/src/main/assets
|
build/android/src/main/assets
|
||||||
|
@ -113,20 +113,20 @@ LOCAL_C_INCLUDES := \
|
|||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
jni/src/ban.cpp \
|
jni/src/ban.cpp \
|
||||||
jni/src/camera.cpp \
|
jni/src/client/camera.cpp \
|
||||||
jni/src/mapgen/cavegen.cpp \
|
jni/src/mapgen/cavegen.cpp \
|
||||||
jni/src/chat.cpp \
|
jni/src/chat.cpp \
|
||||||
jni/src/client.cpp \
|
jni/src/client/client.cpp \
|
||||||
jni/src/clientenvironment.cpp \
|
jni/src/client/clientenvironment.cpp \
|
||||||
jni/src/clientiface.cpp \
|
jni/src/clientiface.cpp \
|
||||||
jni/src/clientmap.cpp \
|
jni/src/client/clientmap.cpp \
|
||||||
jni/src/clientmedia.cpp \
|
jni/src/client/clientmedia.cpp \
|
||||||
jni/src/clientobject.cpp \
|
jni/src/client/clientobject.cpp \
|
||||||
jni/src/clouds.cpp \
|
jni/src/client/clouds.cpp \
|
||||||
jni/src/collision.cpp \
|
jni/src/collision.cpp \
|
||||||
jni/src/content_cao.cpp \
|
jni/src/client/content_cao.cpp \
|
||||||
jni/src/content_cso.cpp \
|
jni/src/client/content_cso.cpp \
|
||||||
jni/src/content_mapblock.cpp \
|
jni/src/client/content_mapblock.cpp \
|
||||||
jni/src/content_mapnode.cpp \
|
jni/src/content_mapnode.cpp \
|
||||||
jni/src/content_nodemeta.cpp \
|
jni/src/content_nodemeta.cpp \
|
||||||
jni/src/content_sao.cpp \
|
jni/src/content_sao.cpp \
|
||||||
@ -147,10 +147,10 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/emerge.cpp \
|
jni/src/emerge.cpp \
|
||||||
jni/src/environment.cpp \
|
jni/src/environment.cpp \
|
||||||
jni/src/face_position_cache.cpp \
|
jni/src/face_position_cache.cpp \
|
||||||
jni/src/filecache.cpp \
|
jni/src/client/filecache.cpp \
|
||||||
jni/src/filesys.cpp \
|
jni/src/filesys.cpp \
|
||||||
jni/src/fontengine.cpp \
|
jni/src/client/fontengine.cpp \
|
||||||
jni/src/game.cpp \
|
jni/src/client/game.cpp \
|
||||||
jni/src/genericobject.cpp \
|
jni/src/genericobject.cpp \
|
||||||
jni/src/gettext.cpp \
|
jni/src/gettext.cpp \
|
||||||
jni/src/gui/guiChatConsole.cpp \
|
jni/src/gui/guiChatConsole.cpp \
|
||||||
@ -162,7 +162,7 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/gui/guiKeyChangeMenu.cpp \
|
jni/src/gui/guiKeyChangeMenu.cpp \
|
||||||
jni/src/gui/guiPasswordChange.cpp \
|
jni/src/gui/guiPasswordChange.cpp \
|
||||||
jni/src/gui/guiTable.cpp \
|
jni/src/gui/guiTable.cpp \
|
||||||
jni/src/guiscalingfilter.cpp \
|
jni/src/client/guiscalingfilter.cpp \
|
||||||
jni/src/gui/guiVolumeChange.cpp \
|
jni/src/gui/guiVolumeChange.cpp \
|
||||||
jni/src/gui/intlGUIEditBox.cpp \
|
jni/src/gui/intlGUIEditBox.cpp \
|
||||||
jni/src/gui/modalMenu.cpp \
|
jni/src/gui/modalMenu.cpp \
|
||||||
@ -170,20 +170,20 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/gui/touchscreengui.cpp \
|
jni/src/gui/touchscreengui.cpp \
|
||||||
jni/src/httpfetch.cpp \
|
jni/src/httpfetch.cpp \
|
||||||
jni/src/hud.cpp \
|
jni/src/hud.cpp \
|
||||||
jni/src/imagefilters.cpp \
|
jni/src/client/imagefilters.cpp \
|
||||||
jni/src/inventory.cpp \
|
jni/src/inventory.cpp \
|
||||||
jni/src/inventorymanager.cpp \
|
jni/src/inventorymanager.cpp \
|
||||||
jni/src/itemdef.cpp \
|
jni/src/itemdef.cpp \
|
||||||
jni/src/itemstackmetadata.cpp \
|
jni/src/itemstackmetadata.cpp \
|
||||||
jni/src/keycode.cpp \
|
jni/src/client/keycode.cpp \
|
||||||
jni/src/light.cpp \
|
jni/src/light.cpp \
|
||||||
jni/src/localplayer.cpp \
|
jni/src/client/localplayer.cpp \
|
||||||
jni/src/log.cpp \
|
jni/src/log.cpp \
|
||||||
jni/src/main.cpp \
|
jni/src/main.cpp \
|
||||||
jni/src/map.cpp \
|
jni/src/map.cpp \
|
||||||
jni/src/map_settings_manager.cpp \
|
jni/src/map_settings_manager.cpp \
|
||||||
jni/src/mapblock.cpp \
|
jni/src/mapblock.cpp \
|
||||||
jni/src/mapblock_mesh.cpp \
|
jni/src/client/mapblock_mesh.cpp \
|
||||||
jni/src/mapgen/mapgen.cpp \
|
jni/src/mapgen/mapgen.cpp \
|
||||||
jni/src/mapgen/mapgen_carpathian.cpp \
|
jni/src/mapgen/mapgen_carpathian.cpp \
|
||||||
jni/src/mapgen/mapgen_flat.cpp \
|
jni/src/mapgen/mapgen_flat.cpp \
|
||||||
@ -195,14 +195,14 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/mapgen/mapgen_valleys.cpp \
|
jni/src/mapgen/mapgen_valleys.cpp \
|
||||||
jni/src/mapnode.cpp \
|
jni/src/mapnode.cpp \
|
||||||
jni/src/mapsector.cpp \
|
jni/src/mapsector.cpp \
|
||||||
jni/src/mesh.cpp \
|
jni/src/client/mesh.cpp \
|
||||||
jni/src/mesh_generator_thread.cpp \
|
jni/src/client/mesh_generator_thread.cpp \
|
||||||
jni/src/metadata.cpp \
|
jni/src/metadata.cpp \
|
||||||
jni/src/mapgen/mg_biome.cpp \
|
jni/src/mapgen/mg_biome.cpp \
|
||||||
jni/src/mapgen/mg_decoration.cpp \
|
jni/src/mapgen/mg_decoration.cpp \
|
||||||
jni/src/mapgen/mg_ore.cpp \
|
jni/src/mapgen/mg_ore.cpp \
|
||||||
jni/src/mapgen/mg_schematic.cpp \
|
jni/src/mapgen/mg_schematic.cpp \
|
||||||
jni/src/minimap.cpp \
|
jni/src/client/minimap.cpp \
|
||||||
jni/src/modchannels.cpp \
|
jni/src/modchannels.cpp \
|
||||||
jni/src/nameidmapping.cpp \
|
jni/src/nameidmapping.cpp \
|
||||||
jni/src/nodedef.cpp \
|
jni/src/nodedef.cpp \
|
||||||
@ -211,7 +211,7 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/noise.cpp \
|
jni/src/noise.cpp \
|
||||||
jni/src/objdef.cpp \
|
jni/src/objdef.cpp \
|
||||||
jni/src/object_properties.cpp \
|
jni/src/object_properties.cpp \
|
||||||
jni/src/particles.cpp \
|
jni/src/client/particles.cpp \
|
||||||
jni/src/pathfinder.cpp \
|
jni/src/pathfinder.cpp \
|
||||||
jni/src/player.cpp \
|
jni/src/player.cpp \
|
||||||
jni/src/porting_android.cpp \
|
jni/src/porting_android.cpp \
|
||||||
@ -229,8 +229,8 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/serverenvironment.cpp \
|
jni/src/serverenvironment.cpp \
|
||||||
jni/src/serverlist.cpp \
|
jni/src/serverlist.cpp \
|
||||||
jni/src/serverobject.cpp \
|
jni/src/serverobject.cpp \
|
||||||
jni/src/shader.cpp \
|
jni/src/client/shader.cpp \
|
||||||
jni/src/sky.cpp \
|
jni/src/client/sky.cpp \
|
||||||
jni/src/staticobject.cpp \
|
jni/src/staticobject.cpp \
|
||||||
jni/src/tileanimation.cpp \
|
jni/src/tileanimation.cpp \
|
||||||
jni/src/translation.cpp \
|
jni/src/translation.cpp \
|
||||||
@ -275,7 +275,7 @@ LOCAL_SRC_FILES := \
|
|||||||
jni/src/unittest/test_voxelalgorithms.cpp \
|
jni/src/unittest/test_voxelalgorithms.cpp \
|
||||||
jni/src/unittest/test_voxelmanipulator.cpp \
|
jni/src/unittest/test_voxelmanipulator.cpp \
|
||||||
jni/src/settings.cpp \
|
jni/src/settings.cpp \
|
||||||
jni/src/wieldmesh.cpp \
|
jni/src/client/wieldmesh.cpp \
|
||||||
jni/src/client/meshgen/collector.cpp \
|
jni/src/client/meshgen/collector.cpp \
|
||||||
jni/src/client/clientlauncher.cpp \
|
jni/src/client/clientlauncher.cpp \
|
||||||
jni/src/client/gameui.cpp \
|
jni/src/client/gameui.cpp \
|
||||||
|
@ -397,12 +397,14 @@ set(common_SRCS
|
|||||||
genericobject.cpp
|
genericobject.cpp
|
||||||
gettext.cpp
|
gettext.cpp
|
||||||
httpfetch.cpp
|
httpfetch.cpp
|
||||||
|
hud.cpp
|
||||||
inventory.cpp
|
inventory.cpp
|
||||||
inventorymanager.cpp
|
inventorymanager.cpp
|
||||||
itemdef.cpp
|
itemdef.cpp
|
||||||
itemstackmetadata.cpp
|
itemstackmetadata.cpp
|
||||||
light.cpp
|
light.cpp
|
||||||
log.cpp
|
log.cpp
|
||||||
|
main.cpp
|
||||||
map.cpp
|
map.cpp
|
||||||
map_settings_manager.cpp
|
map_settings_manager.cpp
|
||||||
mapblock.cpp
|
mapblock.cpp
|
||||||
@ -482,34 +484,6 @@ set(client_SRCS
|
|||||||
${gui_SRCS}
|
${gui_SRCS}
|
||||||
${client_network_SRCS}
|
${client_network_SRCS}
|
||||||
${client_irrlicht_changes_SRCS}
|
${client_irrlicht_changes_SRCS}
|
||||||
camera.cpp
|
|
||||||
client.cpp
|
|
||||||
clientenvironment.cpp
|
|
||||||
clientmap.cpp
|
|
||||||
clientmedia.cpp
|
|
||||||
clientobject.cpp
|
|
||||||
clouds.cpp
|
|
||||||
content_cao.cpp
|
|
||||||
content_cso.cpp
|
|
||||||
content_mapblock.cpp
|
|
||||||
convert_json.cpp
|
|
||||||
filecache.cpp
|
|
||||||
fontengine.cpp
|
|
||||||
game.cpp
|
|
||||||
guiscalingfilter.cpp
|
|
||||||
hud.cpp
|
|
||||||
imagefilters.cpp
|
|
||||||
keycode.cpp
|
|
||||||
localplayer.cpp
|
|
||||||
main.cpp
|
|
||||||
mapblock_mesh.cpp
|
|
||||||
mesh.cpp
|
|
||||||
mesh_generator_thread.cpp
|
|
||||||
minimap.cpp
|
|
||||||
particles.cpp
|
|
||||||
shader.cpp
|
|
||||||
sky.cpp
|
|
||||||
wieldmesh.cpp
|
|
||||||
${client_SCRIPT_SRCS}
|
${client_SCRIPT_SRCS}
|
||||||
${UNITTEST_CLIENT_SRCS}
|
${UNITTEST_CLIENT_SRCS}
|
||||||
)
|
)
|
||||||
@ -518,7 +492,6 @@ list(SORT client_SRCS)
|
|||||||
# Server sources
|
# Server sources
|
||||||
set(server_SRCS
|
set(server_SRCS
|
||||||
${common_SRCS}
|
${common_SRCS}
|
||||||
main.cpp
|
|
||||||
)
|
)
|
||||||
list(SORT server_SRCS)
|
list(SORT server_SRCS)
|
||||||
|
|
||||||
@ -829,10 +802,10 @@ if(BUILD_CLIENT)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(USE_FREETYPE)
|
if(USE_FREETYPE)
|
||||||
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
|
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
|
||||||
FILES_MATCHING PATTERN "*.ttf" PATTERN "*.txt")
|
FILES_MATCHING PATTERN "*.ttf" PATTERN "*.txt")
|
||||||
else()
|
else()
|
||||||
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
|
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
|
||||||
FILES_MATCHING PATTERN "*.png" PATTERN "*.xml")
|
FILES_MATCHING PATTERN "*.png" PATTERN "*.xml")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -25,12 +25,37 @@ set(client_SRCS
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/render/plain.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/render/plain.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/render/sidebyside.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/render/sidebyside.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/render/stereo.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/render/stereo.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/renderingengine.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/camera.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/client.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/clientenvironment.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/clientmap.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/clientmedia.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/clientobject.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/clouds.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/content_cao.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/content_cso.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/content_mapblock.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/filecache.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/fontengine.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/game.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/gameui.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/gameui.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/inputhandler.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/guiscalingfilter.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/joystick_controller.cpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hud.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/hud.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/imagefilters.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/inputhandler.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/joystick_controller.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/keycode.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/localplayer.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/mapblock_mesh.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/mesh.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/mesh_generator_thread.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/minimap.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/particles.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/renderingengine.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/shader.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/sky.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/wieldmesh.cpp
|
||||||
PARENT_SCOPE
|
PARENT_SCOPE
|
||||||
)
|
)
|
||||||
|
@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "collector.h"
|
#include "collector.h"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "mesh.h"
|
#include "client/mesh.h"
|
||||||
|
|
||||||
void MeshCollector::append(const TileSpec &tile, const video::S3DVertex *vertices,
|
void MeshCollector::append(const TileSpec &tile, const video::S3DVertex *vertices,
|
||||||
u32 numVertices, const u16 *indices, u32 numIndices)
|
u32 numVertices, const u16 *indices, u32 numIndices)
|
||||||
|
@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "core.h"
|
#include "core.h"
|
||||||
#include "camera.h"
|
#include "client/camera.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "clientmap.h"
|
#include "client/clientmap.h"
|
||||||
#include "hud.h"
|
#include "client/hud.h"
|
||||||
#include "minimap.h"
|
#include "client/minimap.h"
|
||||||
|
|
||||||
RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud)
|
RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud)
|
||||||
: device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
|
: device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
|
||||||
|
@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "interlaced.h"
|
#include "interlaced.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "shader.h"
|
#include "client/shader.h"
|
||||||
#include "client/tile.h"
|
#include "client/tile.h"
|
||||||
|
|
||||||
RenderingCoreInterlaced::RenderingCoreInterlaced(
|
RenderingCoreInterlaced::RenderingCoreInterlaced(
|
||||||
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "stereo.h"
|
#include "stereo.h"
|
||||||
#include "camera.h"
|
#include "client/camera.h"
|
||||||
#include "constants.h"
|
#include "constants.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "nodedef.h"
|
#include "nodedef.h"
|
||||||
#include "gamedef.h"
|
#include "gamedef.h"
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
#include "clientenvironment.h"
|
#include "client/clientenvironment.h"
|
||||||
#endif
|
#endif
|
||||||
#include "serverenvironment.h"
|
#include "serverenvironment.h"
|
||||||
#include "serverobject.h"
|
#include "serverobject.h"
|
||||||
|
@ -19,14 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include "guiChatConsole.h"
|
#include "guiChatConsole.h"
|
||||||
#include "chat.h"
|
#include "chat.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "gettime.h"
|
#include "gettime.h"
|
||||||
#include "keycode.h"
|
#include "client/keycode.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "porting.h"
|
#include "porting.h"
|
||||||
#include "client/tile.h"
|
#include "client/tile.h"
|
||||||
#include "fontengine.h"
|
#include "client/fontengine.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "guiConfirmRegistration.h"
|
#include "guiConfirmRegistration.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include <IGUICheckBox.h>
|
#include <IGUICheckBox.h>
|
||||||
#include <IGUIButton.h>
|
#include <IGUIButton.h>
|
||||||
#include <IGUIStaticText.h>
|
#include <IGUIStaticText.h>
|
||||||
|
@ -32,11 +32,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "guiMainMenu.h"
|
#include "guiMainMenu.h"
|
||||||
#include "sound.h"
|
#include "sound.h"
|
||||||
#include "client/sound_openal.h"
|
#include "client/sound_openal.h"
|
||||||
#include "clouds.h"
|
#include "client/clouds.h"
|
||||||
#include "httpfetch.h"
|
#include "httpfetch.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "fontengine.h"
|
#include "client/fontengine.h"
|
||||||
#include "guiscalingfilter.h"
|
#include "client/guiscalingfilter.h"
|
||||||
#include "irrlicht_changes/static_text.h"
|
#include "irrlicht_changes/static_text.h"
|
||||||
|
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
|
@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "guiTable.h"
|
#include "guiTable.h"
|
||||||
#include "constants.h"
|
#include "constants.h"
|
||||||
#include "gamedef.h"
|
#include "gamedef.h"
|
||||||
#include "keycode.h"
|
#include "client/keycode.h"
|
||||||
#include "util/strfnd.h"
|
#include "util/strfnd.h"
|
||||||
#include <IGUICheckBox.h>
|
#include <IGUICheckBox.h>
|
||||||
#include <IGUIEditBox.h>
|
#include <IGUIEditBox.h>
|
||||||
@ -47,13 +47,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "mainmenumanager.h"
|
#include "mainmenumanager.h"
|
||||||
#include "porting.h"
|
#include "porting.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "fontengine.h"
|
#include "client/fontengine.h"
|
||||||
#include "util/hex.h"
|
#include "util/hex.h"
|
||||||
#include "util/numeric.h"
|
#include "util/numeric.h"
|
||||||
#include "util/string.h" // for parseColorString()
|
#include "util/string.h" // for parseColorString()
|
||||||
#include "irrlicht_changes/static_text.h"
|
#include "irrlicht_changes/static_text.h"
|
||||||
#include "guiscalingfilter.h"
|
#include "client/guiscalingfilter.h"
|
||||||
#include "guiEditBoxWithScrollbar.h"
|
#include "guiEditBoxWithScrollbar.h"
|
||||||
#include "intlGUIEditBox.h"
|
#include "intlGUIEditBox.h"
|
||||||
|
|
||||||
@ -673,10 +673,10 @@ void GUIFormSpecMenu::parseBackground(parserData* data, const std::string &eleme
|
|||||||
pos.Y = stoi(v_pos[1]); //acts as offset
|
pos.Y = stoi(v_pos[1]); //acts as offset
|
||||||
clip = true;
|
clip = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data->explicit_size && !clip)
|
if (!data->explicit_size && !clip)
|
||||||
warningstream << "invalid use of unclipped background without a size[] element" << std::endl;
|
warningstream << "invalid use of unclipped background without a size[] element" << std::endl;
|
||||||
|
|
||||||
m_backgrounds.emplace_back(name, pos, geom, clip);
|
m_backgrounds.emplace_back(name, pos, geom, clip);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#include "irrlichttypes_extrabloated.h"
|
#include "irrlichttypes_extrabloated.h"
|
||||||
#include "modalMenu.h"
|
#include "modalMenu.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include "keycode.h"
|
#include "client/keycode.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "guiPasswordChange.h"
|
#include "guiPasswordChange.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include <IGUICheckBox.h>
|
#include <IGUICheckBox.h>
|
||||||
#include <IGUIEditBox.h>
|
#include <IGUIEditBox.h>
|
||||||
#include <IGUIButton.h>
|
#include <IGUIButton.h>
|
||||||
|
@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "util/string.h" // for parseColorString()
|
#include "util/string.h" // for parseColorString()
|
||||||
#include "settings.h" // for settings
|
#include "settings.h" // for settings
|
||||||
#include "porting.h" // for dpi
|
#include "porting.h" // for dpi
|
||||||
#include "guiscalingfilter.h"
|
#include "client/guiscalingfilter.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
GUITable
|
GUITable
|
||||||
|
@ -24,11 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "tool.h"
|
#include "tool.h"
|
||||||
#include "inventory.h"
|
#include "inventory.h"
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
#include "mapblock_mesh.h"
|
#include "client/mapblock_mesh.h"
|
||||||
#include "mesh.h"
|
#include "client/mesh.h"
|
||||||
#include "wieldmesh.h"
|
#include "client/wieldmesh.h"
|
||||||
#include "client/tile.h"
|
#include "client/tile.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#endif
|
#endif
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "game.h"
|
#include "client/game.h"
|
||||||
#include "defaultsettings.h"
|
#include "defaultsettings.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "content_nodemeta.h" // For legacy deserialization
|
#include "content_nodemeta.h" // For legacy deserialization
|
||||||
#include "serialization.h"
|
#include "serialization.h"
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
#include "mapblock_mesh.h"
|
#include "client/mapblock_mesh.h"
|
||||||
#endif
|
#endif
|
||||||
#include "porting.h"
|
#include "porting.h"
|
||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
|
@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "networkprotocol.h"
|
#include "networkprotocol.h"
|
||||||
|
|
||||||
class NetworkPacket;
|
class NetworkPacket;
|
||||||
|
@ -17,15 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
|
|
||||||
#include "util/base64.h"
|
#include "util/base64.h"
|
||||||
#include "chatmessage.h"
|
#include "chatmessage.h"
|
||||||
#include "clientmedia.h"
|
#include "client/clientmedia.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
#include "mapsector.h"
|
#include "mapsector.h"
|
||||||
#include "minimap.h"
|
#include "client/minimap.h"
|
||||||
#include "modchannels.h"
|
#include "modchannels.h"
|
||||||
#include "nodedef.h"
|
#include "nodedef.h"
|
||||||
#include "serialization.h"
|
#include "serialization.h"
|
||||||
|
@ -21,9 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include "itemdef.h"
|
#include "itemdef.h"
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
#include "mesh.h"
|
#include "client/mesh.h"
|
||||||
#include "shader.h"
|
#include "client/shader.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "client/renderingengine.h"
|
#include "client/renderingengine.h"
|
||||||
#include "client/tile.h"
|
#include "client/tile.h"
|
||||||
#include <IMeshManipulator.h>
|
#include <IMeshManipulator.h>
|
||||||
|
@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include "s_client.h"
|
#include "s_client.h"
|
||||||
#include "s_internal.h"
|
#include "s_internal.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
#include "common/c_content.h"
|
#include "common/c_content.h"
|
||||||
#include "s_item.h"
|
#include "s_item.h"
|
||||||
|
@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
#include "porting.h"
|
#include "porting.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
|
@ -21,9 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include "script/common/c_converter.h"
|
#include "script/common/c_converter.h"
|
||||||
#include "l_internal.h"
|
#include "l_internal.h"
|
||||||
#include "content_cao.h"
|
#include "client/content_cao.h"
|
||||||
#include "camera.h"
|
#include "client/camera.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
|
|
||||||
LuaCamera::LuaCamera(Camera *m) : m_camera(m)
|
LuaCamera::LuaCamera(Camera *m) : m_camera(m)
|
||||||
{
|
{
|
||||||
|
@ -20,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include "l_client.h"
|
#include "l_client.h"
|
||||||
#include "chatmessage.h"
|
#include "chatmessage.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "client/clientevent.h"
|
#include "client/clientevent.h"
|
||||||
#include "client/sound.h"
|
#include "client/sound.h"
|
||||||
#include "clientenvironment.h"
|
#include "client/clientenvironment.h"
|
||||||
#include "common/c_content.h"
|
#include "common/c_content.h"
|
||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
#include "cpp_api/s_base.h"
|
#include "cpp_api/s_base.h"
|
||||||
|
@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "face_position_cache.h"
|
#include "face_position_cache.h"
|
||||||
#include "remoteplayer.h"
|
#include "remoteplayer.h"
|
||||||
#ifndef SERVER
|
#ifndef SERVER
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct EnumString ModApiEnvMod::es_ClearObjectsMode[] =
|
struct EnumString ModApiEnvMod::es_ClearObjectsMode[] =
|
||||||
|
@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "l_localplayer.h"
|
#include "l_localplayer.h"
|
||||||
#include "l_internal.h"
|
#include "l_internal.h"
|
||||||
#include "script/common/c_converter.h"
|
#include "script/common/c_converter.h"
|
||||||
#include "localplayer.h"
|
#include "client/localplayer.h"
|
||||||
#include "hud.h"
|
#include "hud.h"
|
||||||
#include "common/c_content.h"
|
#include "common/c_content.h"
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "lua_api/l_minimap.h"
|
#include "lua_api/l_minimap.h"
|
||||||
#include "lua_api/l_internal.h"
|
#include "lua_api/l_internal.h"
|
||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "minimap.h"
|
#include "client/minimap.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
LuaMinimap::LuaMinimap(Minimap *m) : m_minimap(m)
|
LuaMinimap::LuaMinimap(Minimap *m) : m_minimap(m)
|
||||||
|
@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
#include "common/c_content.h"
|
#include "common/c_content.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "particles.h"
|
#include "client/particles.h"
|
||||||
|
|
||||||
// add_particle({pos=, velocity=, acceleration=, expirationtime=,
|
// add_particle({pos=, velocity=, acceleration=, expirationtime=,
|
||||||
// size=, collisiondetection=, collision_removal=, object_collision=,
|
// size=, collisiondetection=, collision_removal=, object_collision=,
|
||||||
|
@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "common/c_converter.h"
|
#include "common/c_converter.h"
|
||||||
#include "lua_api/l_internal.h"
|
#include "lua_api/l_internal.h"
|
||||||
#include "lua_api/l_object.h"
|
#include "lua_api/l_object.h"
|
||||||
#include "particles.h"
|
#include "client/particles.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "client/clientevent.h"
|
#include "client/clientevent.h"
|
||||||
|
|
||||||
int ModApiParticlesLocal::l_add_particle(lua_State *L)
|
int ModApiParticlesLocal::l_add_particle(lua_State *L)
|
||||||
|
@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "scripting_client.h"
|
#include "scripting_client.h"
|
||||||
#include "client.h"
|
#include "client/client.h"
|
||||||
#include "cpp_api/s_internal.h"
|
#include "cpp_api/s_internal.h"
|
||||||
#include "lua_api/l_client.h"
|
#include "lua_api/l_client.h"
|
||||||
#include "lua_api/l_env.h"
|
#include "lua_api/l_env.h"
|
||||||
|
@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "exceptions.h"
|
#include "exceptions.h"
|
||||||
#include "keycode.h"
|
#include "client/keycode.h"
|
||||||
|
|
||||||
class TestKeycode : public TestBase {
|
class TestKeycode : public TestBase {
|
||||||
public:
|
public:
|
||||||
|
@ -33,6 +33,77 @@ src/client/render/sidebyside.cpp
|
|||||||
src/client/render/stereo.cpp
|
src/client/render/stereo.cpp
|
||||||
src/client/tile.cpp
|
src/client/tile.cpp
|
||||||
src/client/tile.h
|
src/client/tile.h
|
||||||
|
src/client/fontengine.h
|
||||||
|
src/client/clientenvironment.cpp
|
||||||
|
src/client/mapblock_mesh.cpp
|
||||||
|
src/client/sound_openal.h
|
||||||
|
src/client/clouds.cpp
|
||||||
|
src/client/fontengine.cpp
|
||||||
|
src/client/camera.h
|
||||||
|
src/client/hud.cpp
|
||||||
|
src/client/clientmap.cpp
|
||||||
|
src/client/sound_openal.cpp
|
||||||
|
src/client/minimap.h
|
||||||
|
src/client/content_cao.cpp
|
||||||
|
src/client/localplayer.h
|
||||||
|
src/client/mapblock_mesh.h
|
||||||
|
src/client/mesh.cpp
|
||||||
|
src/client/sound.cpp
|
||||||
|
src/client/guiscalingfilter.cpp
|
||||||
|
src/client/content_cso.cpp
|
||||||
|
src/client/gameui.cpp
|
||||||
|
src/client/wieldmesh.cpp
|
||||||
|
src/client/clientmedia.h
|
||||||
|
src/client/game.cpp
|
||||||
|
src/client/keys.h
|
||||||
|
src/client/client.h
|
||||||
|
src/client/shader.cpp
|
||||||
|
src/client/clientmap.h
|
||||||
|
src/client/inputhandler.h
|
||||||
|
src/client/content_mapblock.h
|
||||||
|
src/client/game.h
|
||||||
|
src/client/mesh.h
|
||||||
|
src/client/camera.cpp
|
||||||
|
src/client/sky.h
|
||||||
|
src/client/mesh_generator_thread.cpp
|
||||||
|
src/client/guiscalingfilter.h
|
||||||
|
src/client/clientobject.cpp
|
||||||
|
src/client/tile.cpp
|
||||||
|
src/client/hud.h
|
||||||
|
src/client/inputhandler.cpp
|
||||||
|
src/client/clientevent.h
|
||||||
|
src/client/gameui.h
|
||||||
|
src/client/content_cso.h
|
||||||
|
src/client/sky.cpp
|
||||||
|
src/client/localplayer.cpp
|
||||||
|
src/client/content_mapblock.cpp
|
||||||
|
src/client/clientobject.h
|
||||||
|
src/client/filecache.cpp
|
||||||
|
src/client/particles.h
|
||||||
|
src/client/clientenvironment.h
|
||||||
|
src/client/imagefilters.h
|
||||||
|
src/client/renderingengine.cpp
|
||||||
|
src/client/tile.h
|
||||||
|
src/client/clientmedia.cpp
|
||||||
|
src/client/event_manager.h
|
||||||
|
src/client/joystick_controller.h
|
||||||
|
src/client/clouds.h
|
||||||
|
src/client/clientlauncher.h
|
||||||
|
src/client/content_cao.h
|
||||||
|
src/client/minimap.cpp
|
||||||
|
src/client/sound.h
|
||||||
|
src/client/keycode.cpp
|
||||||
|
src/client/particles.cpp
|
||||||
|
src/client/joystick_controller.cpp
|
||||||
|
src/client/keycode.h
|
||||||
|
src/client/wieldmesh.h
|
||||||
|
src/client/filecache.h
|
||||||
|
src/client/shader.h
|
||||||
|
src/client/mesh_generator_thread.h
|
||||||
|
src/client/renderingengine.h
|
||||||
|
src/client/client.cpp
|
||||||
|
src/client/imagefilters.cpp
|
||||||
|
src/client/clientlauncher.cpp
|
||||||
src/clouds.cpp
|
src/clouds.cpp
|
||||||
src/clouds.h
|
src/clouds.h
|
||||||
src/collision.cpp
|
src/collision.cpp
|
||||||
|
Loading…
Reference in New Issue
Block a user