Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / loadSave.cpp

diff --git a/src/loadSave.cpp b/src/loadSave.cpp
index feb48b5bb39c0ece63aa62033225c3eb0dc55193..3dfc2e18e8b8426d1dd31ea02bf377d67c87722d 100644 (file)
--- a/src/loadSave.cpp
+++ b/src/loadSave.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -106,7 +107,7 @@ bool loadGame(int slot)
        if (fread(&game, sizeof(Game), 1, fp) != 1)
        {
                fclose(fp);
-               graphics.showErrorAndExit("The save data loaded was not in the format expected", "");
+               return graphics.showErrorAndExit("The save data loaded was not in the format expected", ""), false;
        }
        
        fclose(fp);
@@ -124,7 +125,7 @@ bool loadGame(int slot)
        {
                if (!fgets(line, 1024, fp)) {
                        fclose(fp);
-                       graphics.showErrorAndExit("Unexpected end of file reading save data", "");
+                       return graphics.showErrorAndExit("Unexpected end of file reading save data", ""), false;
                }
 
                sscanf(line, "%*c %[^\"] %*c %*c %[^\"] %*c %d %d", string[0], string[1], &param[0], &param[1]);
@@ -355,13 +356,13 @@ void saveGame()
        
        if (!fp)
        {
-               graphics.showErrorAndExit("File write error whilst saving game", "");
+               return graphics.showErrorAndExit("File write error whilst saving game", "");
        }
 
        if (fwrite(&game, sizeof(Game), 1, fp) != 1)
        {
                fclose(fp);
-               graphics.showErrorAndExit("File write error whilst saving game", strerror(errno));
+               return graphics.showErrorAndExit("File write error whilst saving game", strerror(errno));
        }
        
        fclose(fp);
@@ -372,7 +373,7 @@ void saveGame()
        
        if (!fp)
        {
-               graphics.showErrorAndExit("File write error whilst saving game", "");
+               return graphics.showErrorAndExit("File write error whilst saving game", "");
        }
        
        createPersistantMapData();