aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-04-07 08:50:17 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2017-04-07 08:50:17 +0200
commitf7088f69ab7406ea9fefa853fa7ce11f914e88cf (patch)
treea2457b54c9f5ed6ea65342b3a1fadeeee036d501 /src/script/lua_api
parentb751c59f43e04f698f517383b62a9c4e1f82523e (diff)
downloadminetest-f7088f69ab7406ea9fefa853fa7ce11f914e88cf.tar.gz
minetest-f7088f69ab7406ea9fefa853fa7ce11f914e88cf.tar.bz2
minetest-f7088f69ab7406ea9fefa853fa7ce11f914e88cf.zip
Clang-format: fix some header files and remove them from whitelist
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_mapgen.h3
-rw-r--r--src/script/lua_api/l_sound.h4
-rw-r--r--src/script/lua_api/l_storage.h13
-rw-r--r--src/script/lua_api/l_util.h7
-rw-r--r--src/script/lua_api/l_vmanip.h7
5 files changed, 18 insertions, 16 deletions
diff --git a/src/script/lua_api/l_mapgen.h b/src/script/lua_api/l_mapgen.h
index bb94575c7..a26c8b950 100644
--- a/src/script/lua_api/l_mapgen.h
+++ b/src/script/lua_api/l_mapgen.h
@@ -22,7 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_base.h"
-class ModApiMapgen : public ModApiBase {
+class ModApiMapgen : public ModApiBase
+{
private:
// get_biome_id(biomename)
// returns the biome id used in biomemap
diff --git a/src/script/lua_api/l_sound.h b/src/script/lua_api/l_sound.h
index 86ba9087b..1f0c1eba1 100644
--- a/src/script/lua_api/l_sound.h
+++ b/src/script/lua_api/l_sound.h
@@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_base.h"
-
-class ModApiSound: public ModApiBase
+class ModApiSound : public ModApiBase
{
private:
static int l_sound_play(lua_State *L);
static int l_sound_stop(lua_State *L);
+
public:
static void Initialize(lua_State *L, int top);
};
diff --git a/src/script/lua_api/l_storage.h b/src/script/lua_api/l_storage.h
index fde2828ad..e09b8b391 100644
--- a/src/script/lua_api/l_storage.h
+++ b/src/script/lua_api/l_storage.h
@@ -21,21 +21,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef __L_STORAGE_H__
#define __L_STORAGE_H__
-#include "lua_api/l_base.h"
#include "l_metadata.h"
+#include "lua_api/l_base.h"
class ModMetadata;
-class ModApiStorage: public ModApiBase
+class ModApiStorage : public ModApiBase
{
protected:
static int l_get_mod_storage(lua_State *L);
+
public:
static void Initialize(lua_State *L, int top);
-
};
-class StorageRef: public MetaDataRef
+class StorageRef : public MetaDataRef
{
private:
ModMetadata *m_object;
@@ -43,11 +43,12 @@ private:
static const char className[];
static const luaL_reg methods[];
- virtual Metadata* getmeta(bool auto_create);
+ virtual Metadata *getmeta(bool auto_create);
virtual void clearMeta();
// garbage collector
static int gc_object(lua_State *L);
+
public:
StorageRef(ModMetadata *object);
~StorageRef() {}
@@ -56,7 +57,7 @@ public:
static void create(lua_State *L, ModMetadata *object);
static StorageRef *checkobject(lua_State *L, int narg);
- static ModMetadata* getobject(StorageRef *ref);
+ static ModMetadata *getobject(StorageRef *ref);
};
#endif /* __L_STORAGE_H__ */
diff --git a/src/script/lua_api/l_util.h b/src/script/lua_api/l_util.h
index eef32c0a1..7325a841a 100644
--- a/src/script/lua_api/l_util.h
+++ b/src/script/lua_api/l_util.h
@@ -24,7 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class AsyncEngine;
-class ModApiUtil : public ModApiBase {
+class ModApiUtil : public ModApiBase
+{
private:
/*
NOTE:
@@ -112,9 +113,7 @@ public:
static void InitializeClient(lua_State *L, int top);
- static void InitializeAsync(AsyncEngine& engine);
-
+ static void InitializeAsync(AsyncEngine &engine);
};
#endif /* L_UTIL_H_ */
-
diff --git a/src/script/lua_api/l_vmanip.h b/src/script/lua_api/l_vmanip.h
index 1adb78c4e..65fc0d97a 100644
--- a/src/script/lua_api/l_vmanip.h
+++ b/src/script/lua_api/l_vmanip.h
@@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef L_VMANIP_H_
#define L_VMANIP_H_
-#include "lua_api/l_base.h"
-#include "irr_v3d.h"
#include <map>
+#include "irr_v3d.h"
+#include "lua_api/l_base.h"
class Map;
class MapBlock;
@@ -31,7 +31,8 @@ class MMVManip;
/*
VoxelManip
*/
-class LuaVoxelManip : public ModApiBase {
+class LuaVoxelManip : public ModApiBase
+{
private:
std::map<v3s16, MapBlock *> modified_blocks;
bool is_mapgen_vm;