summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-05-04 07:52:31 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2017-05-04 07:52:31 +0200
commit9a9ae7d65c0112f3b3107547505553a07d7e20c3 (patch)
tree58132efad92821088c0e85ca70b438654f2c30e6
parentdd591119a3945a35f5355bb1e68ee748d39f6f60 (diff)
downloadminetest-9a9ae7d65c0112f3b3107547505553a07d7e20c3.tar.gz
minetest-9a9ae7d65c0112f3b3107547505553a07d7e20c3.tar.bz2
minetest-9a9ae7d65c0112f3b3107547505553a07d7e20c3.zip
LINT fix since cloud API merge
-rw-r--r--src/remoteplayer.h5
-rw-r--r--src/sky.h4
-rw-r--r--src/sound.h8
3 files changed, 7 insertions, 10 deletions
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index 7d46205c5..ee0d625b6 100644
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -107,10 +107,7 @@ public:
m_cloud_params = cloud_params;
}
- const CloudParams &getCloudParams() const
- {
- return m_cloud_params;
- }
+ const CloudParams &getCloudParams() const { return m_cloud_params; }
bool checkModified() const { return m_dirty || inventory.checkModified(); }
diff --git a/src/sky.h b/src/sky.h
index c9678a80b..a014a920b 100644
--- a/src/sky.h
+++ b/src/sky.h
@@ -125,8 +125,8 @@ private:
bool m_sunlight_seen;
float m_brightness;
float m_cloud_brightness;
- bool m_clouds_visible; // Whether clouds are disabled due to player underground
- bool m_clouds_enabled; // Initialised to true, reset only by set_sky API
+ bool m_clouds_visible; // Whether clouds are disabled due to player underground
+ bool m_clouds_enabled; // Initialised to true, reset only by set_sky API
bool m_directional_colored_fog;
video::SColorf m_bgcolor_bright_f;
video::SColorf m_skycolor_bright_f;
diff --git a/src/sound.h b/src/sound.h
index 7bdb6a26b..76c0d1be4 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -65,8 +65,8 @@ public:
// sound. If name=="", call should be ignored without error.
virtual int playSound(const std::string &name, bool loop, float volume,
float fade = 0) = 0;
- virtual int playSoundAt(const std::string &name, bool loop, float volume,
- v3f pos) = 0;
+ virtual int playSoundAt(
+ const std::string &name, bool loop, float volume, v3f pos) = 0;
virtual void stopSound(int sound) = 0;
virtual bool soundExists(int sound) = 0;
virtual void updateSoundPosition(int sound, v3f pos) = 0;
@@ -111,8 +111,8 @@ public:
void updateSoundPosition(int sound, v3f pos) {}
bool updateSoundGain(int id, float gain) { return false; }
float getSoundGain(int id) { return 0; }
- void step(float dtime) { }
- void fadeSound(int sound, float step, float gain) { }
+ void step(float dtime) {}
+ void fadeSound(int sound, float step, float gain) {}
};
// Global DummySoundManager singleton