summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/script/cpp_api/s_client.h4
-rw-r--r--src/script/cpp_api/s_player.h14
-rw-r--r--src/script/lua_api/l_areastore.h5
-rw-r--r--src/script/lua_api/l_metadata.h7
-rw-r--r--src/script/lua_api/l_minimap.h8
-rw-r--r--src/script/lua_api/l_nodetimer.h7
-rw-r--r--src/script/lua_api/l_noise.h27
-rw-r--r--src/script/lua_api/l_server.h4
-rw-r--r--src/script/lua_api/l_settings.h30
-rw-r--r--src/threading/event.h10
-rw-r--r--src/threading/semaphore.h14
-rw-r--r--src/tileanimation.h25
-rw-r--r--src/touchscreengui.h115
-rw-r--r--src/util/cpp11_container.h16
14 files changed, 146 insertions, 140 deletions
diff --git a/src/script/cpp_api/s_client.h b/src/script/cpp_api/s_client.h
index 2369efe3e..9afc66d61 100644
--- a/src/script/cpp_api/s_client.h
+++ b/src/script/cpp_api/s_client.h
@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define S_CLIENT_H_
#include "cpp_api/s_base.h"
-#include "util/string.h"
#include "mapnode.h"
+#include "util/string.h"
#ifdef _CRT_MSVCP_CURRENT
#include <cstdint>
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class ClientEnvironment;
-class ScriptApiClient: virtual public ScriptApiBase
+class ScriptApiClient : virtual public ScriptApiBase
{
public:
// Calls on_shutdown handlers
diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h
index 86ee1b024..9b4611f9e 100644
--- a/src/script/cpp_api/s_player.h
+++ b/src/script/cpp_api/s_player.h
@@ -26,8 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct ToolCapabilities;
-class ScriptApiPlayer
- : virtual public ScriptApiBase
+class ScriptApiPlayer : virtual public ScriptApiBase
{
public:
virtual ~ScriptApiPlayer();
@@ -36,17 +35,16 @@ public:
void on_dieplayer(ServerActiveObject *player);
bool on_respawnplayer(ServerActiveObject *player);
bool on_prejoinplayer(const std::string &name, const std::string &ip,
- std::string *reason);
+ std::string *reason);
void on_joinplayer(ServerActiveObject *player);
void on_leaveplayer(ServerActiveObject *player, bool timeout);
void on_cheat(ServerActiveObject *player, const std::string &cheat_type);
- bool on_punchplayer(ServerActiveObject *player,
- ServerActiveObject *hitter, float time_from_last_punch,
- const ToolCapabilities *toolcap, v3f dir, s16 damage);
+ bool on_punchplayer(ServerActiveObject *player, ServerActiveObject *hitter,
+ float time_from_last_punch, const ToolCapabilities *toolcap,
+ v3f dir, s16 damage);
s16 on_player_hpchange(ServerActiveObject *player, s16 hp_change);
void on_playerReceiveFields(ServerActiveObject *player,
- const std::string &formname, const StringMap &fields);
+ const std::string &formname, const StringMap &fields);
};
-
#endif /* S_PLAYER_H_ */
diff --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h
index 4bd94cebe..7dea08df4 100644
--- a/src/script/lua_api/l_areastore.h
+++ b/src/script/lua_api/l_areastore.h
@@ -22,12 +22,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_base.h"
-
class AreaStore;
-class LuaAreaStore : public ModApiBase {
+class LuaAreaStore : public ModApiBase
+{
private:
-
static const char className[];
static const luaL_reg methods[];
diff --git a/src/script/lua_api/l_metadata.h b/src/script/lua_api/l_metadata.h
index 561be6adf..be31d95ad 100644
--- a/src/script/lua_api/l_metadata.h
+++ b/src/script/lua_api/l_metadata.h
@@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef L_METADATA_H_
#define L_METADATA_H_
-#include "lua_api/l_base.h"
#include "irrlichttypes_bloated.h"
+#include "lua_api/l_base.h"
class Metadata;
@@ -28,14 +28,15 @@ class Metadata;
NodeMetaRef
*/
-class MetaDataRef : public ModApiBase {
+class MetaDataRef : public ModApiBase
+{
public:
virtual ~MetaDataRef() {}
protected:
static MetaDataRef *checkobject(lua_State *L, int narg);
virtual void reportMetadataChange() {}
- virtual Metadata* getmeta(bool auto_create) = 0;
+ virtual Metadata *getmeta(bool auto_create) = 0;
virtual void clearMeta() = 0;
virtual void handleToTable(lua_State *L, Metadata *meta);
diff --git a/src/script/lua_api/l_minimap.h b/src/script/lua_api/l_minimap.h
index d9bb8842c..9a299b4fd 100644
--- a/src/script/lua_api/l_minimap.h
+++ b/src/script/lua_api/l_minimap.h
@@ -22,12 +22,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "l_base.h"
-
class Minimap;
-class LuaMinimap : public ModApiBase {
+class LuaMinimap : public ModApiBase
+{
private:
-
static const char className[];
static const luaL_reg methods[];
@@ -49,6 +48,7 @@ private:
static int l_toggle_shape(lua_State *L);
Minimap *m_minimap;
+
public:
LuaMinimap(Minimap *m);
~LuaMinimap() {}
@@ -56,7 +56,7 @@ public:
static void create(lua_State *L, Minimap *object);
static LuaMinimap *checkobject(lua_State *L, int narg);
- static Minimap* getobject(LuaMinimap *ref);
+ static Minimap *getobject(LuaMinimap *ref);
static void Register(lua_State *L);
};
diff --git a/src/script/lua_api/l_nodetimer.h b/src/script/lua_api/l_nodetimer.h
index 9f8dd21c8..239112037 100644
--- a/src/script/lua_api/l_nodetimer.h
+++ b/src/script/lua_api/l_nodetimer.h
@@ -20,12 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef L_NODETIMER_H_
#define L_NODETIMER_H_
-#include "lua_api/l_base.h"
#include "irr_v3d.h"
+#include "lua_api/l_base.h"
class ServerEnvironment;
-class NodeTimerRef : public ModApiBase {
+class NodeTimerRef : public ModApiBase
+{
private:
v3s16 m_p;
ServerEnvironment *m_env;
@@ -62,6 +63,4 @@ public:
static void Register(lua_State *L);
};
-
-
#endif /* L_NODETIMER_H_ */
diff --git a/src/script/lua_api/l_noise.h b/src/script/lua_api/l_noise.h
index 40bfd1315..11ec348bf 100644
--- a/src/script/lua_api/l_noise.h
+++ b/src/script/lua_api/l_noise.h
@@ -20,14 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef L_NOISE_H_
#define L_NOISE_H_
-#include "lua_api/l_base.h"
#include "irr_v3d.h"
+#include "lua_api/l_base.h"
#include "noise.h"
/*
LuaPerlinNoise
*/
-class LuaPerlinNoise : public ModApiBase {
+class LuaPerlinNoise : public ModApiBase
+{
private:
NoiseParams np;
static const char className[];
@@ -57,7 +58,8 @@ public:
/*
LuaPerlinNoiseMap
*/
-class LuaPerlinNoiseMap : public ModApiBase {
+class LuaPerlinNoiseMap : public ModApiBase
+{
NoiseParams np;
Noise *noise;
bool m_is3d;
@@ -95,7 +97,8 @@ public:
/*
LuaPseudoRandom
*/
-class LuaPseudoRandom : public ModApiBase {
+class LuaPseudoRandom : public ModApiBase
+{
private:
PseudoRandom m_pseudo;
@@ -111,8 +114,7 @@ private:
static int l_next(lua_State *L);
public:
- LuaPseudoRandom(s32 seed) :
- m_pseudo(seed) {}
+ LuaPseudoRandom(s32 seed) : m_pseudo(seed) {}
// LuaPseudoRandom(seed)
// Creates an LuaPseudoRandom and leaves it on top of stack
@@ -126,7 +128,8 @@ public:
/*
LuaPcgRandom
*/
-class LuaPcgRandom : public ModApiBase {
+class LuaPcgRandom : public ModApiBase
+{
private:
PcgRandom m_rnd;
@@ -146,10 +149,8 @@ private:
static int l_rand_normal_dist(lua_State *L);
public:
- LuaPcgRandom(u64 seed) :
- m_rnd(seed) {}
- LuaPcgRandom(u64 seed, u64 seq) :
- m_rnd(seed, seq) {}
+ LuaPcgRandom(u64 seed) : m_rnd(seed) {}
+ LuaPcgRandom(u64 seed, u64 seq) : m_rnd(seed, seq) {}
// LuaPcgRandom(seed)
// Creates an LuaPcgRandom and leaves it on top of stack
@@ -160,11 +161,11 @@ public:
static void Register(lua_State *L);
};
-
/*
LuaSecureRandom
*/
-class LuaSecureRandom : public ModApiBase {
+class LuaSecureRandom : public ModApiBase
+{
private:
static const size_t RAND_BUF_SIZE = 2048;
static const char className[];
diff --git a/src/script/lua_api/l_server.h b/src/script/lua_api/l_server.h
index 1ad46d440..ca5e7b80f 100644
--- a/src/script/lua_api/l_server.h
+++ b/src/script/lua_api/l_server.h
@@ -22,7 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_base.h"
-class ModApiServer : public ModApiBase {
+class ModApiServer : public ModApiBase
+{
private:
// request_shutdown([message], [reconnect])
static int l_request_shutdown(lua_State *L);
@@ -107,7 +108,6 @@ private:
public:
static void Initialize(lua_State *L, int top);
-
};
#endif /* L_SERVER_H_ */
diff --git a/src/script/lua_api/l_settings.h b/src/script/lua_api/l_settings.h
index bca333e31..d5edd32ce 100644
--- a/src/script/lua_api/l_settings.h
+++ b/src/script/lua_api/l_settings.h
@@ -24,51 +24,51 @@ with this program; if not, write to the Free Software Foundation, Inc.,
class Settings;
-class LuaSettings : public ModApiBase {
+class LuaSettings : public ModApiBase
+{
private:
static const char className[];
static const luaL_reg methods[];
// garbage collector
- static int gc_object(lua_State* L);
+ static int gc_object(lua_State *L);
// get(self, key) -> value
- static int l_get(lua_State* L);
+ static int l_get(lua_State *L);
// get_bool(self, key) -> boolean
- static int l_get_bool(lua_State* L);
+ static int l_get_bool(lua_State *L);
// set(self, key, value)
- static int l_set(lua_State* L);
+ static int l_set(lua_State *L);
// remove(self, key) -> success
- static int l_remove(lua_State* L);
+ static int l_remove(lua_State *L);
// get_names(self) -> {key1, ...}
- static int l_get_names(lua_State* L);
+ static int l_get_names(lua_State *L);
// write(self) -> success
- static int l_write(lua_State* L);
+ static int l_write(lua_State *L);
// to_table(self) -> {[key1]=value1,...}
- static int l_to_table(lua_State* L);
+ static int l_to_table(lua_State *L);
bool m_write_allowed;
- Settings* m_settings;
+ Settings *m_settings;
std::string m_filename;
public:
- LuaSettings(const char* filename, bool write_allowed);
+ LuaSettings(const char *filename, bool write_allowed);
~LuaSettings();
// LuaSettings(filename)
// Creates an LuaSettings and leaves it on top of stack
- static int create_object(lua_State* L);
+ static int create_object(lua_State *L);
- static LuaSettings* checkobject(lua_State* L, int narg);
-
- static void Register(lua_State* L);
+ static LuaSettings *checkobject(lua_State *L, int narg);
+ static void Register(lua_State *L);
};
#endif
diff --git a/src/threading/event.h b/src/threading/event.h
index 26cb8997a..79a99ce1f 100644
--- a/src/threading/event.h
+++ b/src/threading/event.h
@@ -29,19 +29,19 @@ DEALINGS IN THE SOFTWARE.
#include "threads.h"
#if USE_CPP11_MUTEX
- #include <condition_variable>
- #include "threading/mutex.h"
- #include "threading/mutex_auto_lock.h"
+#include <condition_variable>
+#include "threading/mutex.h"
+#include "threading/mutex_auto_lock.h"
#endif
-
/** A syncronization primitive that will wake up one waiting thread when signaled.
* Calling @c signal() multiple times before a waiting thread has had a chance
* to notice the signal will wake only one thread. Additionally, if no threads
* are waiting on the event when it is signaled, the next call to @c wait()
* will return (almost) immediately.
*/
-class Event {
+class Event
+{
public:
Event();
#ifndef USE_CPP11_MUTEX
diff --git a/src/threading/semaphore.h b/src/threading/semaphore.h
index 822856396..8ff376666 100644
--- a/src/threading/semaphore.h
+++ b/src/threading/semaphore.h
@@ -21,21 +21,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define THREADING_SEMAPHORE_H
#if defined(_WIN32)
- #include <windows.h>
+#include <windows.h>
#elif defined(__MACH__) && defined(__APPLE__)
- #include <mach/semaphore.h>
+#include <mach/semaphore.h>
#else
- #include <semaphore.h>
+#include <semaphore.h>
#endif
#include "util/basic_macros.h"
-class Semaphore {
+class Semaphore
+{
public:
- Semaphore(int val=0);
+ Semaphore(int val = 0);
~Semaphore();
- void post(unsigned int num=1);
+ void post(unsigned int num = 1);
void wait();
bool wait(unsigned int time_ms);
@@ -52,4 +53,3 @@ private:
};
#endif
-
diff --git a/src/tileanimation.h b/src/tileanimation.h
index eecd3eb96..9872e7917 100644
--- a/src/tileanimation.h
+++ b/src/tileanimation.h
@@ -20,36 +20,41 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef TILEANIMATION_HEADER
#define TILEANIMATION_HEADER
-#include "irrlichttypes_bloated.h"
#include <iostream>
+#include "irrlichttypes_bloated.h"
-enum TileAnimationType {
+enum TileAnimationType
+{
TAT_NONE = 0,
TAT_VERTICAL_FRAMES = 1,
TAT_SHEET_2D = 2,
};
-struct TileAnimationParams {
+struct TileAnimationParams
+{
enum TileAnimationType type;
- union {
+ union
+ {
// struct {
// } none;
- struct {
+ struct
+ {
int aspect_w; // width for aspect ratio
int aspect_h; // height for aspect ratio
float length; // seconds
} vertical_frames;
- struct {
- int frames_w; // number of frames left-to-right
- int frames_h; // number of frames top-to-bottom
+ struct
+ {
+ int frames_w; // number of frames left-to-right
+ int frames_h; // number of frames top-to-bottom
float frame_length; // seconds
} sheet_2d;
};
void serialize(std::ostream &os, u16 protocol_version) const;
void deSerialize(std::istream &is, u16 protocol_version);
- void determineParams(v2u32 texture_size, int *frame_count,
- int *frame_length_ms, v2u32 *frame_size) const;
+ void determineParams(v2u32 texture_size, int *frame_count, int *frame_length_ms,
+ v2u32 *frame_size) const;
void getTextureModifer(std::ostream &os, v2u32 texture_size, int frame) const;
v2f getTextureCoords(v2u32 texture_size, int frame) const;
};
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index 53fc6d683..88e068308 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -19,15 +19,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef TOUCHSCREENGUI_HEADER
#define TOUCHSCREENGUI_HEADER
-#include <IGUIEnvironment.h>
-#include <IGUIButton.h>
#include <IEventReceiver.h>
+#include <IGUIButton.h>
+#include <IGUIEnvironment.h>
-#include <vector>
#include <map>
+#include <vector>
-#include "game.h"
#include "client/tile.h"
+#include "game.h"
using namespace irr;
using namespace irr::core;
@@ -68,32 +68,32 @@ typedef enum {
#define SETTINGS_BAR_Y_OFFSET 6.5
#define RARE_CONTROLS_BAR_Y_OFFSET 4
-extern const char** touchgui_button_imagenames;
+extern const char **touchgui_button_imagenames;
-struct button_info {
- float repeatcounter;
- float repeatdelay;
- irr::EKEY_CODE keycode;
+struct button_info
+{
+ float repeatcounter;
+ float repeatdelay;
+ irr::EKEY_CODE keycode;
std::vector<int> ids;
- IGUIButton* guibutton = NULL;
- bool immediate_release;
+ IGUIButton *guibutton = NULL;
+ bool immediate_release;
};
class AutoHideButtonBar
{
public:
+ AutoHideButtonBar(IrrlichtDevice *device, IEventReceiver *receiver);
- AutoHideButtonBar( IrrlichtDevice *device, IEventReceiver* receiver );
-
- void init(ISimpleTextureSource* tsrc, const char* starter_img,
- int button_id, v2s32 UpperLeft, v2s32 LowerRight,
- autohide_button_bar_dir dir, float timeout);
+ void init(ISimpleTextureSource *tsrc, const char *starter_img, int button_id,
+ v2s32 UpperLeft, v2s32 LowerRight, autohide_button_bar_dir dir,
+ float timeout);
~AutoHideButtonBar();
/* add button to be shown */
- void addButton(touch_gui_button_id id, const wchar_t* caption,
- const char* btn_image);
+ void addButton(touch_gui_button_id id, const wchar_t *caption,
+ const char *btn_image);
/* detect settings bar button events */
bool isButton(const SEvent &event);
@@ -114,40 +114,41 @@ public:
void show();
private:
- ISimpleTextureSource* m_texturesource;
- irr::video::IVideoDriver* m_driver;
- IGUIEnvironment* m_guienv;
- IEventReceiver* m_receiver;
- v2u32 m_screensize;
- button_info m_starter;
- std::vector<button_info*> m_buttons;
+ ISimpleTextureSource *m_texturesource;
+ irr::video::IVideoDriver *m_driver;
+ IGUIEnvironment *m_guienv;
+ IEventReceiver *m_receiver;
+ v2u32 m_screensize;
+ button_info m_starter;
+ std::vector<button_info *> m_buttons;
- v2s32 m_upper_left;
- v2s32 m_lower_right;
+ v2s32 m_upper_left;
+ v2s32 m_lower_right;
/* show settings bar */
- bool m_active;
+ bool m_active;
- bool m_visible;
+ bool m_visible;
/* settings bar timeout */
- float m_timeout;
- float m_timeout_value;
- bool m_initialized;
- autohide_button_bar_dir m_dir;
+ float m_timeout;
+ float m_timeout_value;
+ bool m_initialized;
+ autohide_button_bar_dir m_dir;
};
class TouchScreenGUI
{
public:
- TouchScreenGUI(IrrlichtDevice *device, IEventReceiver* receiver);
+ TouchScreenGUI(IrrlichtDevice *device, IEventReceiver *receiver);
~TouchScreenGUI();
void translateEvent(const SEvent &event);
- void init(ISimpleTextureSource* tsrc);
+ void init(ISimpleTextureSource *tsrc);
- double getYawChange() {
+ double getYawChange()
+ {
double res = m_camera_yaw_change;
m_camera_yaw_change = 0;
return res;
@@ -166,28 +167,28 @@ public:
void show();
private:
- IrrlichtDevice* m_device;
- IGUIEnvironment* m_guienv;
- IEventReceiver* m_receiver;
- ISimpleTextureSource* m_texturesource;
- v2u32 m_screensize;
- std::map<int,rect<s32> > m_hud_rects;
- std::map<int,irr::EKEY_CODE> m_hud_ids;
- bool m_visible; // is the gui visible
+ IrrlichtDevice *m_device;
+ IGUIEnvironment *m_guienv;
+ IEventReceiver *m_receiver;
+ ISimpleTextureSource *m_texturesource;
+ v2u32 m_screensize;
+ std::map<int, rect<s32>> m_hud_rects;
+ std::map<int, irr::EKEY_CODE> m_hud_ids;
+ bool m_visible; // is the gui visible
/* value in degree */
- double m_camera_yaw_change;
- double m_camera_pitch;
+ double m_camera_yaw_change;
+ double m_camera_pitch;
- line3d<f32> m_shootline;
+ line3d<f32> m_shootline;
- rect<s32> m_control_pad_rect;
+ rect<s32> m_control_pad_rect;
- int m_move_id;
- bool m_move_has_really_moved;
- s32 m_move_downtime;
- bool m_move_sent_as_mouse_event;
- v2s32 m_move_downlocation;
+ int m_move_id;
+ bool m_move_has_really_moved;
+ s32 m_move_downtime;
+ bool m_move_sent_as_mouse_event;
+ v2s32 m_move_downlocation;
button_info m_buttons[after_last_element_id];
@@ -206,9 +207,10 @@ private:
float repeat_delay = BUTTON_REPEAT_DELAY);
/* load texture */
- void loadButtonTexture(button_info* btn, const char* path, rect<s32> button_rect);
+ void loadButtonTexture(button_info *btn, const char *path, rect<s32> button_rect);
- struct id_status{
+ struct id_status
+ {
int id;
int X;
int Y;
@@ -236,7 +238,8 @@ private:
int getGuiButtonSize();
/* doubleclick detection variables */
- struct key_event {
+ struct key_event
+ {
unsigned int down_time;
s32 x;
s32 y;
diff --git a/src/util/cpp11_container.h b/src/util/cpp11_container.h
index 88317c9c4..0194385fc 100644
--- a/src/util/cpp11_container.h
+++ b/src/util/cpp11_container.h
@@ -29,15 +29,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#endif
#ifdef USE_UNORDERED_CONTAINERS
- #include <unordered_map>
- #include <unordered_set>
- #define UNORDERED_MAP std::unordered_map
- #define UNORDERED_SET std::unordered_set
+#include <unordered_map>
+#include <unordered_set>
+#define UNORDERED_MAP std::unordered_map
+#define UNORDERED_SET std::unordered_set
#else
- #include <map>
- #include <set>
- #define UNORDERED_MAP std::map
- #define UNORDERED_SET std::set
+#include <map>
+#include <set>
+#define UNORDERED_MAP std::map
+#define UNORDERED_SET std::set
#endif
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:26:53 +0000