Skip to content

Commit

Permalink
LINT fix since cloud API merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nerzhul committed May 4, 2017
1 parent dd59111 commit 9a9ae7d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
5 changes: 1 addition & 4 deletions src/remoteplayer.h
Expand Up @@ -107,10 +107,7 @@ class RemotePlayer : public Player
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(); }

Expand Down
4 changes: 2 additions & 2 deletions src/sky.h
Expand Up @@ -125,8 +125,8 @@ class Sky : public scene::ISceneNode
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;
Expand Down
8 changes: 4 additions & 4 deletions src/sound.h
Expand Up @@ -65,8 +65,8 @@ class ISoundManager
// 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;
Expand Down Expand Up @@ -111,8 +111,8 @@ class DummySoundManager : public ISoundManager
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
Expand Down

0 comments on commit 9a9ae7d

Please sign in to comment.