Speicherfehler behoben (Danke Sascha)

[c128-kasse] / src / config.c

diff --git a/src/config.c b/src/config.c
index db80ce38a36f92540227b92fde0ecf15f76d5013..34a09a21b863ea7591fbfab9763e626625127cc1 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,6 +1,6 @@
 /* 
  * RGB2R-C128-Kassenprogramm
- * (c) 2007 phil_fry, sECuRE, sur5r
+ * (c) 2007-2008 phil_fry, sECuRE, sur5r
  * See LICENSE for license information
  *
  */
@@ -11,16 +11,22 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdbool.h>
+
+#include "kasse.h"
 #include "general.h"
 #include "config.h"
 
-/* undocumented function which scratches files */
+/* NOTE: undocumented function which scratches files
+   We need to use this function because linking unistd.h
+   makes our program break at runtime.
+ */
 unsigned char __fastcall__ _sysremove(const char *name);
 
 unsigned long int money = 0;
 unsigned long int items_sold = 0;
 BYTE printer_port = 4;
-static bool files_existing = false;
+static bool items_exists = false;
+static bool credits_exists = false;
 struct status_array_t status;
 struct credits_array_t credits;
 
@@ -30,47 +36,58 @@ struct credits_array_t credits;
  * files directly)
  *
  */
-bool lookup_needed_files() {
+static void lookup_needed_files() {
        BYTE lfn = 8;
-       BYTE files_existing = 0;
-       struct cbm_dirent *dirent;
+       struct cbm_dirent dirent;
 
        if (cbm_opendir(lfn, (BYTE)8) != 0) {
                cprintf("could not open directory\r\n");
-               return false;
+               return;
+       }
+       while (cbm_readdir(lfn, &dirent) == 0) {
+               if (strncmp(dirent.name, "log", 3) == 0)
+                       log_num++;
+               if (strcasecmp(dirent.name, "items") == 0)
+                       items_exists = true;
+               if (strcasecmp(dirent.name, "credits") == 0)
+                       credits_exists = true;
        }
-       while (cbm_readdir(lfn, dirent) == 0)
-               if (    strcasecmp(dirent->name, "items") == 0 ||
-                       strcasecmp(dirent->name, "credits") == 0)
-                       files_existing++;
        cbm_closedir(lfn);
-       return (files_existing >= 2);
 }
 
 void load_items() {
-       if (files_existing)
+       BYTE c;
+
+       if (items_exists) {
+               items_sold = 0;
                cbm_load("items", (BYTE)8, &status);
+               for (c = 0; c < status.num_items; c++)
+                       items_sold += status.status[c].times_sold;
+       } else
+               memset(&status, 0, sizeof(struct status_array_t));
 }
 
 void load_credits() {
-       if (files_existing)
+       if (credits_exists)
                cbm_load("credits", (BYTE)8, &credits);
+       else
+               memset(&credits, 0, sizeof(struct credits_array_t));
 }
 
 void save_items() {
-       if (files_existing)
+       if (items_exists)
                _sysremove("items");
        cbm_save("items", (BYTE)8, &status, sizeof(struct status_array_t));
-       files_existing = true;
+       items_exists = true;
 }
 
 void save_credits() {
-       if (files_existing)
+       if (credits_exists)
                _sysremove("credits");
        cbm_save("credits", (BYTE)8, &credits, sizeof(struct credits_array_t));
-       files_existing = true;
+       credits_exists = true;
 }
 
 void load_config() {
-       files_existing = lookup_needed_files();
+       lookup_needed_files();
 }