mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-18 02:34:57 +00:00
Code Issues Releases Wiki Activity

Remove some now unused/unneeded leftovers

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Aquaria/Game.cpp
View file

@ -2528,11 +2528,6 @@ float Game::getHalfTimer(float mod)
void Game::action(int id, int state, int source)
{
{
std::ostringstream os;
os << "Game:action " << id << ", " << state << ", " << source;
debugLog(os.str());
}
for (int i = 0; i < paths.size(); i++)
{
if (paths[i]->catchActions)

13
Aquaria/InGameMenu.cpp
View file

@ -3809,19 +3809,6 @@ void InGameMenu::switchToKeyConfigPage(int page)
keyCategoryButtons[page]->inactiveAlpha = 0.7f;
group_keyConfig[page]->setHidden(false);
group_keyConfig[page]->alpha = 1;
// FG: FIXME: changed layout: m, k1, k2, j
/*RenderObject::Children::reverse_iterator it = group_keyConfig[page]->children.rbegin();
AquariaKeyConfig *upright0 = (AquariaKeyConfig*)(*it++);
AquariaKeyConfig *upright = (AquariaKeyConfig*)(*it++);
AquariaKeyConfig *upleft = (AquariaKeyConfig*)(*it++);
opt_cancel->setDirMove(DIR_UP, upright);
upright->setDirMove(DIR_DOWN, opt_cancel);
upright0->setDirMove(DIR_DOWN, opt_cancel);
opt_save->setDirMove(DIR_UP, upleft);
upleft->setDirMove(DIR_DOWN, opt_save);*/
}
void InGameMenu::toggleOptionsMenu(bool f, bool skipBackup, bool isKeyConfig)

1
Aquaria/SceneEditor.cpp
View file

@ -603,7 +603,6 @@ void SceneEditor::init()
addAction(ACTION_BGLAYER14, KEY_COMMA, -1);
addAction(ACTION_BGLAYER15, KEY_PERIOD, -1);
addAction(ACTION_BGLAYER16, KEY_SLASH, -1);
addAction(ACTION_BGLAYER16, KEY_MINUS, -1); // HACK: for german keyboard layout -- FG
addAction(ACTION_MULTISELECT, KEY_LALT, -1);

14
BBGE/ActionInput.h
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

24
BBGE/ActionSet.cpp
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;
}

4
BBGE/ActionSet.h
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);