mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-26 16:03:58 +00:00
Code Issues Releases Wiki Activity

Allow nodes to catch revert action

Browse source
This commit is contained in:
fgenesis 2013-04-22 02:39:58 +02:00
parent d992e280cc
commit f835f6c83c
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Aquaria/Avatar.cpp
View file

@ -152,7 +152,7 @@ void Avatar::bindInput()
dsq->user.control.actionSet.importAction(this, "PrimaryAction", ACTION_PRIMARY); dsq->user.control.actionSet.importAction(this, "PrimaryAction", ACTION_PRIMARY);
dsq->user.control.actionSet.importAction(this, "SecondaryAction", ACTION_SECONDARY); dsq->user.control.actionSet.importAction(this, "SecondaryAction", ACTION_SECONDARY);
dsq->user.control.actionSet.importAction(this, "Revert", MakeFunctionEvent(Avatar, revert), 0); dsq->user.control.actionSet.importAction(this, "Revert", ACTION_REVERT);
dsq->user.control.actionSet.importAction(this, "SwimUp", ACTION_SWIMUP); dsq->user.control.actionSet.importAction(this, "SwimUp", ACTION_SWIMUP);
dsq->user.control.actionSet.importAction(this, "SwimDown", ACTION_SWIMDOWN); dsq->user.control.actionSet.importAction(this, "SwimDown", ACTION_SWIMDOWN);
@ -4510,6 +4510,9 @@ void Avatar::action(int id, int state)
if (id == ACTION_PRIMARY) { if (state) lmbd(); else lmbu(); } if (id == ACTION_PRIMARY) { if (state) lmbd(); else lmbu(); }
if (id == ACTION_SECONDARY) { if (state) rmbd(); else rmbu(); } if (id == ACTION_SECONDARY) { if (state) rmbd(); else rmbu(); }
if (id == ACTION_REVERT && !state)
revert();
if (id == ACTION_PRIMARY && state)// !state if (id == ACTION_PRIMARY && state)// !state
{ {
if (isMiniMapCursorOkay()) if (isMiniMapCursorOkay())

1
Aquaria/DSQ.h
View file

@ -122,6 +122,7 @@ enum AquariaActions
ACTION_ROLL, ACTION_ROLL,
ACTION_SLOW, // currently unused ACTION_SLOW, // currently unused
ACTION_REVERT,
ACTION_ZOOMIN = 200, ACTION_ZOOMIN = 200,
ACTION_ZOOMOUT, ACTION_ZOOMOUT,

2
Aquaria/Game.cpp
View file

@ -6933,6 +6933,8 @@ void Game::bindInput()
dsq->user.control.actionSet.importAction(this, "SongSlot9", ACTION_SONGSLOT9); dsq->user.control.actionSet.importAction(this, "SongSlot9", ACTION_SONGSLOT9);
dsq->user.control.actionSet.importAction(this, "SongSlot10", ACTION_SONGSLOT10); dsq->user.control.actionSet.importAction(this, "SongSlot10", ACTION_SONGSLOT10);
dsq->user.control.actionSet.importAction(this, "Revert", ACTION_REVERT);
if (avatar) if (avatar)
avatar->bindInput(); avatar->bindInput();