aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparamat <paramat@users.noreply.github.com>2017-11-06 09:58:26 +0000
committerparamat <mat.gregory@virginmedia.com>2017-11-06 12:54:08 +0000
commit179476d8330ff0fd03c3c95bbb8ea0f55e5ad2ed (patch)
tree99811e7d1430a9d064e40e3a2b13a08f6bf5930b
parent4c40e0775ca564296a56f72ff3adce50ba925b0c (diff)
downloadminetest-179476d8330ff0fd03c3c95bbb8ea0f55e5ad2ed.tar.gz
minetest-179476d8330ff0fd03c3c95bbb8ea0f55e5ad2ed.tar.bz2
minetest-179476d8330ff0fd03c3c95bbb8ea0f55e5ad2ed.zip
LINT: Add files to whitelist, fix detected indent errors
-rw-r--r--src/client/render/core.cpp6
-rw-r--r--src/client/render/interlaced.cpp4
-rw-r--r--src/client/render/plain.cpp4
-rw-r--r--src/client/render/sidebyside.cpp4
-rw-r--r--src/client/render/stereo.cpp4
-rw-r--r--util/travis/clang-format-whitelist.txt37
6 files changed, 36 insertions, 23 deletions
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 7a4230c84..89b7371f1 100644
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -26,9 +26,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "minimap.h"
RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud)
- : device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
- guienv(device->getGUIEnvironment()), client(_client), camera(client->getCamera()),
- mapper(client->getMinimap()), hud(_hud)
+ : device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
+ guienv(device->getGUIEnvironment()), client(_client), camera(client->getCamera()),
+ mapper(client->getMinimap()), hud(_hud)
{
screensize = driver->getScreenSize();
virtual_size = screensize;
diff --git a/src/client/render/interlaced.cpp b/src/client/render/interlaced.cpp
index ccd4e60cf..aac928475 100644
--- a/src/client/render/interlaced.cpp
+++ b/src/client/render/interlaced.cpp
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client/tile.h"
RenderingCoreInterlaced::RenderingCoreInterlaced(
- IrrlichtDevice *_device, Client *_client, Hud *_hud)
- : RenderingCoreStereo(_device, _client, _hud)
+ IrrlichtDevice *_device, Client *_client, Hud *_hud)
+ : RenderingCoreStereo(_device, _client, _hud)
{
initMaterial();
}
diff --git a/src/client/render/plain.cpp b/src/client/render/plain.cpp
index 94921245b..cb87c6b30 100644
--- a/src/client/render/plain.cpp
+++ b/src/client/render/plain.cpp
@@ -27,8 +27,8 @@ inline u32 scaledown(u32 coef, u32 size)
}
RenderingCorePlain::RenderingCorePlain(
- IrrlichtDevice *_device, Client *_client, Hud *_hud)
- : RenderingCore(_device, _client, _hud)
+ IrrlichtDevice *_device, Client *_client, Hud *_hud)
+ : RenderingCore(_device, _client, _hud)
{
scale = g_settings->getU16("undersampling");
}
diff --git a/src/client/render/sidebyside.cpp b/src/client/render/sidebyside.cpp
index 2af09ee33..d2c171794 100644
--- a/src/client/render/sidebyside.cpp
+++ b/src/client/render/sidebyside.cpp
@@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "hud.h"
RenderingCoreSideBySide::RenderingCoreSideBySide(
- IrrlichtDevice *_device, Client *_client, Hud *_hud, bool _horizontal)
- : RenderingCoreStereo(_device, _client, _hud), horizontal(_horizontal)
+ IrrlichtDevice *_device, Client *_client, Hud *_hud, bool _horizontal)
+ : RenderingCoreStereo(_device, _client, _hud), horizontal(_horizontal)
{
}
diff --git a/src/client/render/stereo.cpp b/src/client/render/stereo.cpp
index eec9f8ced..1fa72d0fa 100644
--- a/src/client/render/stereo.cpp
+++ b/src/client/render/stereo.cpp
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
RenderingCoreStereo::RenderingCoreStereo(
- IrrlichtDevice *_device, Client *_client, Hud *_hud)
- : RenderingCore(_device, _client, _hud)
+ IrrlichtDevice *_device, Client *_client, Hud *_hud)
+ : RenderingCore(_device, _client, _hud)
{
eye_offset = BS * g_settings->getFloat("3d_paralax_strength");
}
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 3fb9da141..f86d7ecb3 100644
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -3,26 +3,32 @@ src/ban.cpp
src/camera.cpp
src/camera.h
src/cavegen.cpp
+src/cavegen.h
src/chat.cpp
src/chat.h
src/chat_interface.h
-src/client/clientlauncher.cpp
-src/client/clientlauncher.h
src/client.cpp
+src/client.h
src/clientenvironment.cpp
src/clientenvironment.h
-src/client.h
src/clientiface.cpp
src/clientiface.h
-src/client/joystick_controller.cpp
-src/client/joystick_controller.h
-src/client/renderingengine.cpp
src/clientmap.cpp
src/clientmap.h
src/clientmedia.cpp
src/clientmedia.h
src/clientobject.cpp
src/clientobject.h
+src/client/clientlauncher.cpp
+src/client/clientlauncher.h
+src/client/joystick_controller.cpp
+src/client/joystick_controller.h
+src/client/renderingengine.cpp
+src/client/render/core.cpp
+src/client/render/interlaced.cpp
+src/client/render/plain.cpp
+src/client/render/sidebyside.cpp
+src/client/render/stereo.cpp
src/client/tile.cpp
src/client/tile.h
src/clouds.cpp
@@ -74,8 +80,8 @@ src/filesys.h
src/fontengine.cpp
src/fontengine.h
src/game.cpp
-src/gamedef.h
src/game.h
+src/gamedef.h
src/genericobject.cpp
src/genericobject.h
src/gettext.cpp
@@ -131,21 +137,25 @@ src/mapblock.h
src/mapblock_mesh.cpp
src/mapblock_mesh.h
src/map.cpp
+src/map.h
src/mapgen.cpp
+src/mapgen.h
src/mapgen_carpathian.cpp
src/mapgen_carpathian.h
src/mapgen_flat.cpp
+src/mapgen_flat.h
src/mapgen_fractal.cpp
-src/mapgen.h
+src/mapgen_fractal.h
src/mapgen_singlenode.cpp
+src/mapgen_singlenode.h
src/mapgen_v5.cpp
+src/mapgen_v5.h
src/mapgen_v6.cpp
src/mapgen_v6.h
src/mapgen_v7.cpp
src/mapgen_v7.h
src/mapgen_valleys.cpp
src/mapgen_valleys.h
-src/map.h
src/mapnode.cpp
src/mapnode.h
src/mapsector.cpp
@@ -267,6 +277,7 @@ src/script/lua_api/l_localplayer.cpp
src/script/lua_api/l_mainmenu.cpp
src/script/lua_api/l_mainmenu.h
src/script/lua_api/l_mapgen.cpp
+src/script/lua_api/l_mapgen.h
src/script/lua_api/l_metadata.cpp
src/script/lua_api/l_minimap.cpp
src/script/lua_api/l_nodemeta.cpp
@@ -294,9 +305,11 @@ src/script/scripting_server.h
src/serialization.cpp
src/serialization.h
src/server.cpp
+src/server.h
+src/serveractiveobjectmap.cpp
+src/serveractiveobjectmap.h
src/serverenvironment.cpp
src/serverenvironment.h
-src/server.h
src/serverlist.cpp
src/serverlist.h
src/serverobject.cpp
@@ -332,13 +345,13 @@ src/touchscreengui.cpp
src/translation.cpp
src/treegen.cpp
src/treegen.h
+src/unittest/test.cpp
+src/unittest/test.h
src/unittest/test_areastore.cpp
src/unittest/test_collision.cpp
src/unittest/test_compression.cpp
src/unittest/test_connection.cpp
-src/unittest/test.cpp
src/unittest/test_filepath.cpp
-src/unittest/test.h
src/unittest/test_inventory.cpp
src/unittest/test_keycode.cpp
src/unittest/test_map_settings_manager.cpp