Fix more conflicts
parent
c99e2c8b1f
commit
7c12549654
|
@ -2606,10 +2606,6 @@ void Game::processKeyInput()
|
||||||
}
|
}
|
||||||
client->typeChatMessage(narrow_to_wide("/" + kc.command));
|
client->typeChatMessage(narrow_to_wide("/" + kc.command));
|
||||||
|
|
||||||
statustext = narrow_to_wide(
|
|
||||||
"Pressed key " + kc.setting_name + " with command " + kc.command);
|
|
||||||
// TODO: This used to be needed, but the variable is no longer in scope
|
|
||||||
// statustext_time = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -283,11 +283,10 @@ private:
|
||||||
float step;
|
float step;
|
||||||
float current_gain;
|
float current_gain;
|
||||||
float target_gain;
|
float target_gain;
|
||||||
|
};
|
||||||
|
|
||||||
UNORDERED_MAP<int, FadeState> m_sounds_fading;
|
UNORDERED_MAP<int, FadeState> m_sounds_fading;
|
||||||
float m_fade_delay;
|
float m_fade_delay;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool m_is_initialized;
|
bool m_is_initialized;
|
||||||
OpenALSoundManager(OnDemandSoundFetcher *fetcher):
|
OpenALSoundManager(OnDemandSoundFetcher *fetcher):
|
||||||
|
@ -565,7 +564,6 @@ public:
|
||||||
int playSound(const std::string &name, bool loop, float volume, float fade)
|
int playSound(const std::string &name, bool loop, float volume, float fade)
|
||||||
{
|
{
|
||||||
maintain();
|
maintain();
|
||||||
int handle = -1;
|
|
||||||
if(name == "")
|
if(name == "")
|
||||||
return 0;
|
return 0;
|
||||||
SoundBuffer *buf = getFetchBuffer(name);
|
SoundBuffer *buf = getFetchBuffer(name);
|
||||||
|
|
Loading…
Reference in New Issue