merge

diff --git a/Changelog b/Changelog
index 62dbbb9b98ddfe7a36046b7f2422871a74014ddb..b28637660b61b5a88c473fe6bfc317daa9c38005 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -254,3 +254,6 @@
 ==========
 
        - worlds can now be saved & loaded from a file
+       - created 'storyboard' for first few player areas
+       - improved flashlight
+       - made some minor improvements to world appearance

diff --git a/main.cpp b/main.cpp
index b3e94c4f898aaee2175098e5723475e9d701efd9..c68b342a1dac2bb94777997b5653c1036087ffbb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -491,7 +491,6 @@ int main(int argc, char *argv[]){
     char *worldBuf;
     unsigned int worldSize;
     worldBuf=currentWorld->save(&worldSize);
-    if(ferror(worldSave))perror("HEY: ");
     fclose(worldSave);
     
     return 0;  // Calls everything passed to atexit