AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 15:41:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
greye 2012-08-17 15:36:51 +04:00
parent 4f10138a04
commit 7303d595dd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwbase/inputmanager.hpp
View File

@ -22,7 +22,7 @@ namespace MWBase
virtual ~InputManager() {} virtual ~InputManager() {}
virtual void update() = 0; virtual void update(float duration) = 0;
virtual void changeInputMode(bool guiMode) = 0; virtual void changeInputMode(bool guiMode) = 0;

6
apps/openmw/mwinput/inputmanagerimp.cpp
View File

@ -450,7 +450,7 @@ private:
} }
} }
void toggleControlSwitch(std::string sw, bool value) void toggleControlSwitch(const std::string &sw, bool value)
{ {
if (mControlSwitch[sw] == value) { if (mControlSwitch[sw] == value) {
return; return;
@ -472,7 +472,7 @@ private:
mControlSwitch[sw] = value; mControlSwitch[sw] = value;
} }
bool getControlSwitch(std::string sw) bool getControlSwitch(const std::string &sw)
{ {
return mControlSwitch[sw]; return mControlSwitch[sw];
} }
@ -536,7 +536,7 @@ private:
impl->toggleControlSwitch(sw, value); impl->toggleControlSwitch(sw, value);
} }
bool MWInputManager::getControlSwitch(std::string sw) bool MWInputManager::getControlSwitch(const std::string &sw)
{ {
return impl->getControlSwitch(sw); return impl->getControlSwitch(sw);
} }

4
apps/openmw/mwinput/inputmanagerimp.hpp
View File

@ -60,8 +60,8 @@ namespace MWInput
virtual void setDragDrop(bool dragDrop); virtual void setDragDrop(bool dragDrop);
void toggleControlSwitch(std::string sw, bool value); void toggleControlSwitch(const std::string &sw, bool value);
bool getControlSwitch(std::string sw); bool getControlSwitch(const std::string &sw);
}; };
} }
#endif #endif