pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LINT fix since cloud API merge

master
Loic Blot 2017-05-04 07:52:31 +02:00
parent dd591119a3
commit 9a9ae7d65c
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/remoteplayer.h
View File

@ -107,10 +107,7 @@ public:
m_cloud_params = cloud_params; m_cloud_params = cloud_params;
} }
const CloudParams &getCloudParams() const const CloudParams &getCloudParams() const { return m_cloud_params; }
{
return m_cloud_params;
}
bool checkModified() const { return m_dirty || inventory.checkModified(); } bool checkModified() const { return m_dirty || inventory.checkModified(); }

4
src/sky.h
View File

@ -125,8 +125,8 @@ private:
bool m_sunlight_seen; bool m_sunlight_seen;
float m_brightness; float m_brightness;
float m_cloud_brightness; float m_cloud_brightness;
bool m_clouds_visible; // Whether clouds are disabled due to player underground 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_enabled; // Initialised to true, reset only by set_sky API
bool m_directional_colored_fog; bool m_directional_colored_fog;
video::SColorf m_bgcolor_bright_f; video::SColorf m_bgcolor_bright_f;
video::SColorf m_skycolor_bright_f; video::SColorf m_skycolor_bright_f;

8
src/sound.h
View File

@ -65,8 +65,8 @@ public:
// sound. If name=="", call should be ignored without error. // sound. If name=="", call should be ignored without error.
virtual int playSound(const std::string &name, bool loop, float volume, virtual int playSound(const std::string &name, bool loop, float volume,
float fade = 0) = 0; float fade = 0) = 0;
virtual int playSoundAt(const std::string &name, bool loop, float volume, virtual int playSoundAt(
v3f pos) = 0; const std::string &name, bool loop, float volume, v3f pos) = 0;
virtual void stopSound(int sound) = 0; virtual void stopSound(int sound) = 0;
virtual bool soundExists(int sound) = 0; virtual bool soundExists(int sound) = 0;
virtual void updateSoundPosition(int sound, v3f pos) = 0; virtual void updateSoundPosition(int sound, v3f pos) = 0;
@ -111,8 +111,8 @@ public:
void updateSoundPosition(int sound, v3f pos) {} void updateSoundPosition(int sound, v3f pos) {}
bool updateSoundGain(int id, float gain) { return false; } bool updateSoundGain(int id, float gain) { return false; }
float getSoundGain(int id) { return 0; } float getSoundGain(int id) { return 0; }
void step(float dtime) { } void step(float dtime) {}
void fadeSound(int sound, float step, float gain) { } void fadeSound(int sound, float step, float gain) {}
}; };
// Global DummySoundManager singleton // Global DummySoundManager singleton