X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fconfig.c;h=6f561248a473743c9fb0dfcdd237b8cb5a59f1c6;hb=defab3aeca9d460cf07267a2d1f59146f5528e65;hp=a094c05fb0a8c6717e926207ecffef4d886445eb;hpb=45e614ab946149d48330c5cf39e846b5911002cf;p=c128-kasse

diff --git a/src/config.c b/src/config.c
index a094c05..6f56124 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,6 +1,6 @@
-/* 
+/*
  * RGB2R-C128-Kassenprogramm
- * (c) 2007 phil_fry, sECuRE, sur5r
+ * © 2007-2009 phil_fry, sECuRE, sur5r
  * See LICENSE for license information
  *
  */
@@ -15,8 +15,12 @@
 #include "kasse.h"
 #include "general.h"
 #include "config.h"
+#include "print.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;
@@ -27,59 +31,88 @@ static bool credits_exists = false;
 struct status_array_t status;
 struct credits_array_t credits;
 
-/* 
+/*
  * Checks if items/credits-files are existing to avoid having to recover
  * the error state of the drive (we'd have to if we would just access the
  * files directly)
  *
  */
-static void lookup_needed_files() {
-	BYTE lfn = 8;
-	struct cbm_dirent *dirent;
+static void lookup_needed_files(void) {
+  BYTE lfn = 8, c;
+  struct cbm_dirent dirent;
+  char filename[8];
 
-	if (cbm_opendir(lfn, (BYTE)8) != 0) {
-		cprintf("could not open directory\r\n");
-		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;
-	}
-	cbm_closedir(lfn);
-}
+  if (cbm_opendir(lfn, (BYTE)8) != 0) {
+    cprintf("could not open directory\r\n");
+    return;
+  }
+  while (cbm_readdir(lfn, &dirent) == 0) {
+    /* NOTE: You MUST NOT delete any logfiles. This does only work
+     * under the assumption that logfiles are named continuously */
+    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;
+  }
+  cbm_closedir(lfn);
+
+  /* Try to find out how many lines the last logfile got to seamlessly
+   * append to it, if we got more than one logfile. */
+  if (log_num > 0) {
+    log_num--;
 
-void load_items() {
-	if (items_exists)
-		cbm_load("items", (BYTE)8, &status);
-	else
-		memset(&status, 0, sizeof(struct status_array_t));
+    sprintf(filename, "log-%u", log_num);
+    if ((c = cbm_open(lfn, (BYTE)8, (BYTE)CBM_READ, filename)) != 0) {
+      c128_perror(c, "cbm_open(log) for reading");
+      exit(1);
+    }
+    log_heap_offset = cbm_read(lfn, log_heap_buf, LOG_SIZE);
+    if (log_heap_offset < 0) {
+      cprintf("error while cbm_read()ing the logfile\r\n");
+      exit(1);
+    }
+    log_heap_flushed = log_heap_offset;
+    log_heap_buf[log_heap_offset] = '\0';
+    cbm_close(lfn);
+  }
 }
 
-void load_credits() {
-	if (credits_exists)
-		cbm_load("credits", (BYTE)8, &credits);
-	else
-		memset(&credits, 0, sizeof(struct credits_array_t));
+void load_items(void) {
+  BYTE c;
+
+  if (items_exists) {
+    items_sold = 0;
+    money = 0;
+    cbm_load("items", (BYTE)8, &status);
+    for (c = 0; c < status.num_items; c++) {
+      items_sold += status.status[c].times_sold;
+      money += (status.status[c].price * status.status[c].times_sold);
+    }
+  } else
+    memset(&status, 0, sizeof(struct status_array_t));
 }
 
-void save_items() {
-	if (items_exists)
-		_sysremove("items");
-	cbm_save("items", (BYTE)8, &status, sizeof(struct status_array_t));
-	items_exists = true;
+void load_credits(void) {
+  if (credits_exists)
+    cbm_load("credits", (BYTE)8, &credits);
+  else
+    memset(&credits, 0, sizeof(struct credits_array_t));
 }
 
-void save_credits() {
-	if (credits_exists)
-		_sysremove("credits");
-	cbm_save("credits", (BYTE)8, &credits, sizeof(struct credits_array_t));
-	credits_exists = true;
+void save_items(void) {
+  if (items_exists)
+    _sysremove("items");
+  cbm_save("items", (BYTE)8, &status, sizeof(struct status_array_t));
+  items_exists = true;
 }
 
-void load_config() {
-	lookup_needed_files();
+void save_credits(void) {
+  if (credits_exists)
+    _sysremove("credits");
+  cbm_save("credits", (BYTE)8, &credits, sizeof(struct credits_array_t));
+  credits_exists = true;
 }
+
+void load_config(void) { lookup_needed_files(); }