walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Allow screenshot key to be configured.

This commit is contained in:
Steve 2016-04-23 17:46:47 +01:00
parent 95b7d7f589
commit 5d59f1f353
7 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/app/config.json
View File

@ -16,7 +16,8 @@
"CONTROL_GUNS" : 29, "CONTROL_GUNS" : 29,
"CONTROL_RADAR" : 27, "CONTROL_RADAR" : 27,
"CONTROL_PREV_FIGHTER" : 4, "CONTROL_PREV_FIGHTER" : 4,
"CONTROL_NEXT_FIGHTER" : 7 "CONTROL_NEXT_FIGHTER" : 7,
"CONTROL_SCREENSHOT" : 69
}, },
"mouse" : { "mouse" : {
"CONTROL_FIRE" : 1, "CONTROL_FIRE" : 1,
@ -29,7 +30,8 @@
"CONTROL_GUNS" : 4, "CONTROL_GUNS" : 4,
"CONTROL_RADAR" : 5, "CONTROL_RADAR" : 5,
"CONTROL_PREV_FIGHTER" : 4, "CONTROL_PREV_FIGHTER" : 4,
"CONTROL_NEXT_FIGHTER" : 5 "CONTROL_NEXT_FIGHTER" : 5,
"CONTROL_SCREENSHOT" : 0
} }
} }
} }

9
data/widgets/controls.json
View File

@ -98,6 +98,15 @@
"w" : 175, "w" : 175,
"h": 34 "h": 34
}, },
{
"name" : "CONTROL_SCREENSHOT",
"group" : "controls",
"type" : "WT_CONTROL_CONFIG",
"x" : 0,
"y" : 0,
"w" : 175,
"h": 34
},
{ {
"name" : "ok", "name" : "ok",
"group" : "controls", "group" : "controls",

1
src/defs.h
View File

@ -144,6 +144,7 @@ enum
CONTROL_RADAR, CONTROL_RADAR,
CONTROL_PREV_FIGHTER, CONTROL_PREV_FIGHTER,
CONTROL_NEXT_FIGHTER, CONTROL_NEXT_FIGHTER,
CONTROL_SCREENSHOT,
CONTROL_MAX CONTROL_MAX
}; };

4
src/main.c
View File

@ -135,11 +135,11 @@ int main(int argc, char *argv[])
} }
} }
if (app.keyboard[SDL_SCANCODE_F12]) if (isControl(CONTROL_SCREENSHOT))
{ {
saveScreenshot(); saveScreenshot();
app.keyboard[SDL_SCANCODE_F12] = 0; clearControl(CONTROL_SCREENSHOT);
} }
if (SDL_GetTicks() > expireTextTimer) if (SDL_GetTicks() > expireTextTimer)

2
src/main.h
View File

@ -49,6 +49,8 @@ extern void initGame(void);
extern void doKeyDown(SDL_KeyboardEvent *event); extern void doKeyDown(SDL_KeyboardEvent *event);
extern void doKeyUp(SDL_KeyboardEvent *event); extern void doKeyUp(SDL_KeyboardEvent *event);
extern void createScreenshotFolder(void); extern void createScreenshotFolder(void);
extern int isControl(int type);
extern void clearControl(int type);
App app; App app;
Colors colors; Colors colors;

1
src/system/controls.c
View File

@ -40,6 +40,7 @@ void initControls(void)
controlName[CONTROL_RADAR] = _("Cycle Radar"); controlName[CONTROL_RADAR] = _("Cycle Radar");
controlName[CONTROL_NEXT_FIGHTER] = _("Next Fighter"); controlName[CONTROL_NEXT_FIGHTER] = _("Next Fighter");
controlName[CONTROL_PREV_FIGHTER] = _("Previous Fighter"); controlName[CONTROL_PREV_FIGHTER] = _("Previous Fighter");
controlName[CONTROL_SCREENSHOT] = _("Screenshot");
for (i = 0 ; i < CONTROL_MAX ; i++) for (i = 0 ; i < CONTROL_MAX ; i++)
{ {

5
src/system/lookup.c
View File

@ -41,13 +41,14 @@ void initLookups(void)
addLookup("CONTROL_RADAR", CONTROL_RADAR); addLookup("CONTROL_RADAR", CONTROL_RADAR);
addLookup("CONTROL_NEXT_FIGHTER", CONTROL_NEXT_FIGHTER); addLookup("CONTROL_NEXT_FIGHTER", CONTROL_NEXT_FIGHTER);
addLookup("CONTROL_PREV_FIGHTER", CONTROL_PREV_FIGHTER); addLookup("CONTROL_PREV_FIGHTER", CONTROL_PREV_FIGHTER);
addLookup("CONTROL_SCREENSHOT", CONTROL_SCREENSHOT);
addLookup("ET_WAYPOINT", ET_WAYPOINT); addLookup("ET_WAYPOINT", ET_WAYPOINT);
addLookup("ET_JUMPGATE", ET_JUMPGATE); addLookup("ET_JUMPGATE", ET_JUMPGATE);
addLookup("ET_CAPITAL_SHIP", ET_CAPITAL_SHIP); addLookup("ET_CAPITAL_SHIP", ET_CAPITAL_SHIP);
addLookup("ET_MINE", ET_MINE); addLookup("ET_MINE", ET_MINE);
addLookup("ET_SHADOW_MINE", ET_SHADOW_MINE); addLookup("ET_SHADOW_MINE", ET_SHADOW_MINE);
addLookup("EF_NO_KILL", EF_NO_KILL); addLookup("EF_NO_KILL", EF_NO_KILL);
addLookup("EF_DISABLED", EF_DISABLED); addLookup("EF_DISABLED", EF_DISABLED);
addLookup("EF_MUST_DISABLE", EF_MUST_DISABLE); addLookup("EF_MUST_DISABLE", EF_MUST_DISABLE);