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

Don't save trophy screenshot - is too buggy and often crashes.

This commit is contained in:
Steve 2018-04-21 12:43:50 +01:00
parent 09afbfc0d9
commit c2712d8916
6 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/options.c
View File

@ -28,7 +28,6 @@ static void musicVolume(void);
static void fullscreen(void); static void fullscreen(void);
static void windowSize(void); static void windowSize(void);
static void bloodGore(void); static void bloodGore(void);
static void trophyScreenshot(void);
static void trophyAlert(void); static void trophyAlert(void);
static void inventory(void); static void inventory(void);
static void controls(void); static void controls(void);
@ -43,7 +42,6 @@ static Widget *musicVolumeWidget;
static Widget *windowSizeWidget; static Widget *windowSizeWidget;
static Widget *fullscreenWidget; static Widget *fullscreenWidget;
static Widget *bloodGoreWidget; static Widget *bloodGoreWidget;
static Widget *trophyScreenshotWidget;
static Widget *trophyAlertWidget; static Widget *trophyAlertWidget;
static Widget *inventoryWidget; static Widget *inventoryWidget;
static Widget *controlsWidget; static Widget *controlsWidget;
@ -96,10 +94,6 @@ static void setGeneralOptions(void)
bloodGoreWidget->action = bloodGore; bloodGoreWidget->action = bloodGore;
bloodGoreWidget->value[0] = app.config.blood; bloodGoreWidget->value[0] = app.config.blood;
trophyScreenshotWidget = getWidget("trophyScreenshot", "options");
trophyScreenshotWidget->action = trophyScreenshot;
trophyScreenshotWidget->value[0] = app.config.trophyScreenshot;
trophyAlertWidget = getWidget("trophyAlert", "options"); trophyAlertWidget = getWidget("trophyAlert", "options");
trophyAlertWidget->action = trophyAlert; trophyAlertWidget->action = trophyAlert;
trophyAlertWidget->value[0] = app.config.trophyAlert; trophyAlertWidget->value[0] = app.config.trophyAlert;
@ -213,11 +207,6 @@ static void bloodGore(void)
app.config.blood = bloodGoreWidget->value[0]; app.config.blood = bloodGoreWidget->value[0];
} }
static void trophyScreenshot(void)
{
app.config.trophyScreenshot = trophyScreenshotWidget->value[0];
}
static void trophyAlert(void) static void trophyAlert(void)
{ {
app.config.trophyAlert = trophyAlertWidget->value[0]; app.config.trophyAlert = trophyAlertWidget->value[0];

10
src/game/trophies.c
View File

@ -332,16 +332,6 @@ void drawTrophyAlert(void)
} }
} }
void saveTrophyScreenshot(void)
{
if (alertTrophy && alertRect.x == -1 && app.config.trophyScreenshot && !savedScreenshot)
{
saveScreenshot(alertTrophy->id);
savedScreenshot = 1;
}
}
void loadTrophyData(void) void loadTrophyData(void)
{ {
cJSON *root, *node; cJSON *root, *node;

2
src/main.c
View File

@ -67,8 +67,6 @@ int main(int argc, char *argv[])
presentScene(); presentScene();
saveTrophyScreenshot();
then = capFrameRate(then); then = capFrameRate(then);
frames++; frames++;

1
src/main.h
View File

@ -37,7 +37,6 @@ extern void initCredits(void);
extern void prepareScene(void); extern void prepareScene(void);
extern void presentScene(void); extern void presentScene(void);
extern void saveScreenshot(char *name); extern void saveScreenshot(char *name);
extern void saveTrophyScreenshot(void);
extern void initTitle(void); extern void initTitle(void);
extern void createScreenshotFolder(void); extern void createScreenshotFolder(void);

1
src/structs.h
View File

@ -333,7 +333,6 @@ typedef struct {
int joypadControls[CONTROL_MAX]; int joypadControls[CONTROL_MAX];
int inventory; int inventory;
int blood; int blood;
int trophyScreenshot;
int trophyAlert; int trophyAlert;
} Config; } Config;

3
src/system/init.c
View File

@ -197,7 +197,6 @@ static void initDefaultConfig(void)
app.config.inventory = 1; app.config.inventory = 1;
app.config.blood = 1; app.config.blood = 1;
app.config.trophyAlert = 1; app.config.trophyAlert = 1;
app.config.trophyScreenshot = 1;
app.config.musicVolume = 100; app.config.musicVolume = 100;
app.config.soundVolume = 128; app.config.soundVolume = 128;
@ -251,7 +250,6 @@ static void loadConfig(void)
app.config.inventory = cJSON_GetObjectItem(root, "inventory")->valueint; app.config.inventory = cJSON_GetObjectItem(root, "inventory")->valueint;
app.config.blood = cJSON_GetObjectItem(root, "blood")->valueint; app.config.blood = cJSON_GetObjectItem(root, "blood")->valueint;
app.config.trophyAlert = cJSON_GetObjectItem(root, "trophyAlert")->valueint; app.config.trophyAlert = cJSON_GetObjectItem(root, "trophyAlert")->valueint;
app.config.trophyScreenshot = cJSON_GetObjectItem(root, "trophyScreenshot")->valueint;
controlsJSON = cJSON_GetObjectItem(root, "controls"); controlsJSON = cJSON_GetObjectItem(root, "controls");
if (controlsJSON) if (controlsJSON)
@ -304,7 +302,6 @@ void saveConfig(void)
cJSON_AddNumberToObject(root, "blood", app.config.blood); cJSON_AddNumberToObject(root, "blood", app.config.blood);
cJSON_AddNumberToObject(root, "inventory", app.config.inventory); cJSON_AddNumberToObject(root, "inventory", app.config.inventory);
cJSON_AddNumberToObject(root, "trophyAlert", app.config.trophyAlert); cJSON_AddNumberToObject(root, "trophyAlert", app.config.trophyAlert);
cJSON_AddNumberToObject(root, "trophyScreenshot", app.config.trophyScreenshot);
keysJSON = cJSON_CreateObject(); keysJSON = cJSON_CreateObject();
for (i = 0 ; i < CONTROL_MAX ; i++) for (i = 0 ; i < CONTROL_MAX ; i++)