diff --git a/src/game/options.c b/src/game/options.c index 0babf1d..bb8bf4f 100644 --- a/src/game/options.c +++ b/src/game/options.c @@ -28,7 +28,6 @@ static void musicVolume(void); static void fullscreen(void); static void windowSize(void); static void bloodGore(void); -static void trophyScreenshot(void); static void trophyAlert(void); static void inventory(void); static void controls(void); @@ -43,7 +42,6 @@ static Widget *musicVolumeWidget; static Widget *windowSizeWidget; static Widget *fullscreenWidget; static Widget *bloodGoreWidget; -static Widget *trophyScreenshotWidget; static Widget *trophyAlertWidget; static Widget *inventoryWidget; static Widget *controlsWidget; @@ -96,10 +94,6 @@ static void setGeneralOptions(void) bloodGoreWidget->action = bloodGore; bloodGoreWidget->value[0] = app.config.blood; - trophyScreenshotWidget = getWidget("trophyScreenshot", "options"); - trophyScreenshotWidget->action = trophyScreenshot; - trophyScreenshotWidget->value[0] = app.config.trophyScreenshot; - trophyAlertWidget = getWidget("trophyAlert", "options"); trophyAlertWidget->action = trophyAlert; trophyAlertWidget->value[0] = app.config.trophyAlert; @@ -213,11 +207,6 @@ static void bloodGore(void) app.config.blood = bloodGoreWidget->value[0]; } -static void trophyScreenshot(void) -{ - app.config.trophyScreenshot = trophyScreenshotWidget->value[0]; -} - static void trophyAlert(void) { app.config.trophyAlert = trophyAlertWidget->value[0]; diff --git a/src/game/trophies.c b/src/game/trophies.c index 8312dd7..ae27026 100644 --- a/src/game/trophies.c +++ b/src/game/trophies.c @@ -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) { cJSON *root, *node; diff --git a/src/main.c b/src/main.c index 5318843..f1efeb3 100644 --- a/src/main.c +++ b/src/main.c @@ -67,8 +67,6 @@ int main(int argc, char *argv[]) presentScene(); - saveTrophyScreenshot(); - then = capFrameRate(then); frames++; diff --git a/src/main.h b/src/main.h index 2ce48fc..62cfeda 100644 --- a/src/main.h +++ b/src/main.h @@ -37,7 +37,6 @@ extern void initCredits(void); extern void prepareScene(void); extern void presentScene(void); extern void saveScreenshot(char *name); -extern void saveTrophyScreenshot(void); extern void initTitle(void); extern void createScreenshotFolder(void); diff --git a/src/structs.h b/src/structs.h index 117c9a5..cb47caf 100644 --- a/src/structs.h +++ b/src/structs.h @@ -333,7 +333,6 @@ typedef struct { int joypadControls[CONTROL_MAX]; int inventory; int blood; - int trophyScreenshot; int trophyAlert; } Config; diff --git a/src/system/init.c b/src/system/init.c index 6d990c9..9af2e6d 100644 --- a/src/system/init.c +++ b/src/system/init.c @@ -197,7 +197,6 @@ static void initDefaultConfig(void) app.config.inventory = 1; app.config.blood = 1; app.config.trophyAlert = 1; - app.config.trophyScreenshot = 1; app.config.musicVolume = 100; app.config.soundVolume = 128; @@ -251,7 +250,6 @@ static void loadConfig(void) app.config.inventory = cJSON_GetObjectItem(root, "inventory")->valueint; app.config.blood = cJSON_GetObjectItem(root, "blood")->valueint; app.config.trophyAlert = cJSON_GetObjectItem(root, "trophyAlert")->valueint; - app.config.trophyScreenshot = cJSON_GetObjectItem(root, "trophyScreenshot")->valueint; controlsJSON = cJSON_GetObjectItem(root, "controls"); if (controlsJSON) @@ -304,7 +302,6 @@ void saveConfig(void) cJSON_AddNumberToObject(root, "blood", app.config.blood); cJSON_AddNumberToObject(root, "inventory", app.config.inventory); cJSON_AddNumberToObject(root, "trophyAlert", app.config.trophyAlert); - cJSON_AddNumberToObject(root, "trophyScreenshot", app.config.trophyScreenshot); keysJSON = cJSON_CreateObject(); for (i = 0 ; i < CONTROL_MAX ; i++)