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

Implement configurable screenshot key

Browse source
This commit is contained in:
fgenesis 2016-07-14 04:59:08 +02:00
parent a043dd852f
commit dcd4fe6c86
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Aquaria/DSQ.cpp
View file

@ -673,8 +673,8 @@ void DSQ::debugMenu()
void DSQ::takeScreenshotKey() void DSQ::takeScreenshotKey()
{ {
if (core->getCtrlState() && core->getAltState()) if (getCtrlState() && getAltState())
takeScreenshot(); screenshot();
} }
Quad *loading=0; Quad *loading=0;
@ -1754,13 +1754,6 @@ void DSQ::toggleRenderCollisionShapes()
RenderObject::renderCollisionShape = !RenderObject::renderCollisionShape; RenderObject::renderCollisionShape = !RenderObject::renderCollisionShape;
} }
void DSQ::takeScreenshot()
{
doScreenshot = true;
}
void DSQ::unloadDevice() void DSQ::unloadDevice()
{ {
destroyFonts(); destroyFonts();
@ -3738,6 +3731,11 @@ void DSQ::action(int id, int state, int source)
} }
} }
} }
if(id == ACTION_SCREENSHOT && state)
{
screenshot();
}
} }
void DSQ::bindInput() void DSQ::bindInput()
@ -3759,8 +3757,8 @@ void DSQ::bindInput()
addAction(MakeFunctionEvent(DSQ, toggleRenderCollisionShapes), KEY_RETURN, 0); addAction(MakeFunctionEvent(DSQ, toggleRenderCollisionShapes), KEY_RETURN, 0);
} }
addAction(MakeFunctionEvent(DSQ, debugMenu), KEY_BACKSPACE, 0); addAction(MakeFunctionEvent(DSQ, debugMenu), KEY_BACKSPACE, 0);
addAction(MakeFunctionEvent(DSQ, takeScreenshot ), KEY_PRINTSCREEN, 0); //addAction(MakeFunctionEvent(DSQ, takeScreenshotKey ), KEY_P, 0);
addAction(MakeFunctionEvent(DSQ, takeScreenshotKey ), KEY_P, 0); user.control.actionSet.importAction(this, "Screenshot", ACTION_SCREENSHOT);
} }
void DSQ::jiggleCursor() void DSQ::jiggleCursor()

1
Aquaria/DSQ.h
View file

@ -323,7 +323,6 @@ public:
std::string dialogueFile; std::string dialogueFile;
void takeScreenshot();
void takeScreenshotKey(); void takeScreenshotKey();
void generateCollisionMask(RenderObject *r); void generateCollisionMask(RenderObject *r);

1
Aquaria/GameEnums.h
View file

@ -110,6 +110,7 @@ enum AquariaActions
ACTION_LOOK , ACTION_LOOK ,
ACTION_TOGGLEHELPSCREEN, ACTION_TOGGLEHELPSCREEN,
ACTION_PLACE_AVATAR, ACTION_PLACE_AVATAR,
ACTION_SCREENSHOT,
}; };
enum AuraType enum AuraType

1
Aquaria/UserSettings.cpp
View file

@ -330,6 +330,7 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
control.actionSet.addActionInput("FoodDrop"); control.actionSet.addActionInput("FoodDrop");
control.actionSet.addActionInput("Look"); control.actionSet.addActionInput("Look");
control.actionSet.addActionInput("ToggleHelp"); control.actionSet.addActionInput("ToggleHelp");
control.actionSet.addActionInput("Screenshot");
XMLElement *xml_system = doc.FirstChildElement("System"); XMLElement *xml_system = doc.FirstChildElement("System");
if (xml_system) if (xml_system)

1
files/data/stringbank.txt
View file

@ -241,6 +241,7 @@
2129 Song Slot # 2129 Song Slot #
2130 Category 2130 Category
2131 Mouse 2131 Mouse
2132 Take Screenshot
2150 Movement 2150 Movement
2151 Menu 2151 Menu
2152 Quick Keys 2152 Quick Keys