1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00

Remove some now unused/unneeded leftovers

This commit is contained in:
fgenesis 2016-07-18 01:34:43 +02:00
parent ab959bc6d6
commit 619d3d531b
6 changed files with 0 additions and 61 deletions

View file

@ -53,22 +53,8 @@ public:
int all[INP_COMBINED_SIZE];
};
inline bool hasMouse(int actionID) const { return _has(mse, actionID); }
inline bool hasKey(int actionID) const { return _has(key, actionID); }
inline bool hasJoy(int actionID) const { return _has(joy, actionID); }
std::string toString() const;
void fromString(const std::string &read);
private:
template<size_t N>
static inline bool _has(const int (&a)[N], int actionID)
{
for(size_t i = 0; i < N; ++i)
if(a[i] == actionID)
return true;
return false;
}
};
enum InputSetType

View file

@ -250,27 +250,3 @@ std::string ActionSet::insertInputIntoString(const std::string &string)
return part1 + part2 + part3;
}
*/
bool ActionSet::hasMouse(int actionID) const
{
for(size_t i = 0; i < inputSet.size(); ++i)
if(inputSet[i].hasMouse(actionID))
return true;
return false;
}
bool ActionSet::hasKey(int actionID) const
{
for(size_t i = 0; i < inputSet.size(); ++i)
if(inputSet[i].hasKey(actionID))
return true;
return false;
}
bool ActionSet::hasJoy(int actionID) const
{
for(size_t i = 0; i < inputSet.size(); ++i)
if(inputSet[i].hasJoy(actionID))
return true;
return false;
}

View file

@ -54,10 +54,6 @@ public:
void assignJoystickIdx(int idx, bool updateValues);
void updateJoystick();
bool hasMouse(int actionID) const;
bool hasKey(int actionID) const;
bool hasJoy(int actionID) const;
ActionInput *addActionInput(const std::string &name);
ActionInput *getActionInputByName(const std::string &name);