X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fitemz.c;h=19e4233e24cd8a8f2dc337f4cca5d6efc179bef2;hb=402c43204aec8096d0ac676cea51b13a286db006;hp=591118af73877a9160ad98575ae7c7571b4a7bd8;hpb=946fa5052f1d3cc4fc4077c380cb86ce4c566a00;p=c128-kasse

diff --git a/src/itemz.c b/src/itemz.c
index 591118a..19e4233 100644
--- a/src/itemz.c
+++ b/src/itemz.c
@@ -16,128 +16,141 @@
 #include "config.h"
 #include "credit_manager.h"
 #include "version.h"
+#include "vdc_patch_charset.h"
+#include "globals.h"
 
-static void itemz_print_screen() {
-	BYTE i;
-	char buffer[10];
-
-	clrscr();
-	cprintf("itemz (phil_fry, sECuRE, sur5r) v:" GV "\r\n\r\n");
-	cprintf("Datei: ITEMS\r\n\r\n");
-	for (i = 0; i < max(status.num_items, 15); i++) {
-		if (format_euro(buffer, 10, status.status[i].price) != buffer) {
-			cprintf("Error: Could not format price %d\r\n", status.status[i].price);
-			exit(1);
-		}
-		cprintf("Eintrag %2d: %s (%s, %d mal verkauft)\r\n",
-			i, status.status[i].item_name, buffer, status.status[i].times_sold);
-	}
-	cprintf("\r\nn) Neu d) Loeschen s) Speichern m) Credit Modus q) Beenden\r\nr) Reset des Verkauft-Zaehlers\r\n");
+static void itemz_print_screen(void) {
+  BYTE i;
+  char buffer[EUR_FORMAT_MINLEN + 1];
+
+  clrscr();
+  cprintf("itemz (phil_fry, sECuRE, sur5r, mxf) v:" GV "\r\n\r\n");
+  cprintf("Datei: ITEMS\r\n\r\n");
+  for (i = 0; i < max(status.num_items, 15); i++) {
+    if (format_euro(buffer, sizeof(buffer), status.status[i].price) != buffer) {
+      cprintf("Error: Could not format price %d\r\n", status.status[i].price);
+      exit(1);
+    }
+    cprintf("Eintrag %2d: %s (%s, %d mal verkauft)\r\n", i,
+            status.status[i].item_name, buffer, status.status[i].times_sold);
+  }
+  cprintf("\r\nn) Neu d) L" oUML "schen s) Speichern m) Credit Modus q) "
+          "Beenden\r\nr) Reset des Verkauft-Z" aUML "hlers\r\n");
 }
 
-static void new_item() {
-	char *input, *name;
-	int price;
-
-	if (status.num_items == MAX_ITEMS) {
-		cprintf("\rEs ist bereits die maximale Anzahl an Eintraegen erreicht, druecke RETURN...\r\n");
-		input = get_input();
-		return;
-	}
-
-	cprintf("\rName des Eintrags:\r\n");
-	if ((input = get_input()) == NULL || *input == '\0')
-		return;
-	name = strdup(input);
-	cprintf("\r\nPreis in Cents:\r\n");
-	if ((input = get_input()) == NULL || *input == '\0' || (price = atoi(input)) == 0)
-		return;
-	cprintf("\r\nWie oft schon verkauft? [0] \r\n");
-	if ((input = get_input()) == NULL)
-		return;
-	memset(status.status[status.num_items].item_name, '\0', MAX_ITEM_NAME_LENGTH+1);
-	strncpy(status.status[status.num_items].item_name, name, MAX_ITEM_NAME_LENGTH);
-	status.status[status.num_items].price = price;
-	status.status[status.num_items].times_sold = atoi(input);
-	status.num_items++;
-	free(name);
+static void new_item(void) {
+  char name[MAX_ITEM_NAME_LENGTH + 1];
+  int price, times_sold;
+
+  if (status.num_items == MAX_ITEMS) {
+    cprintf("\rEs ist bereits die maximale Anzahl an Eintr" aUML
+            "gen erreicht, dr" uUML "cke RETURN...\r\n");
+    cget_return();
+    return;
+  }
+
+  cprintf("\rName des Eintrags:\r\n");
+  if (cgetn_input(name, sizeof(name)) == 0)
+    return;
+  cprintf("\r\nPreis in Cents:\r\n");
+  if ((price = cget_number(0)) <= 0)
+    return;
+  cprintf("\r\nWie oft schon verkauft? [0] \r\n");
+  if ((times_sold = cget_number(0)) < 0)
+    return;
+  memset(status.status[status.num_items].item_name, '\0',
+         MAX_ITEM_NAME_LENGTH + 1);
+  strncpy(status.status[status.num_items].item_name, name,
+          MAX_ITEM_NAME_LENGTH);
+  status.status[status.num_items].price = price;
+  status.status[status.num_items].times_sold = times_sold;
+  status.num_items++;
 }
 
 static void _delete_item(BYTE num) {
-	memset(status.status[num].item_name, '\0', MAX_ITEM_NAME_LENGTH);
-	status.status[num].price = 0;
-	status.status[num].times_sold = 0;
+  memset(status.status[num].item_name, '\0', MAX_ITEM_NAME_LENGTH);
+  status.status[num].price = 0;
+  status.status[num].times_sold = 0;
 }
 
-static void delete_item() {
-	char *input;
-	BYTE num, last;
-
-	cprintf("\r Welcher Eintrag soll geloescht werden?\r\n");
-	if ((input = get_input()) == NULL || *input == '\0')
-		return;
-	num = atoi(input);
-	if (status.num_items > 1) {
-		/* Swap last item with this one and delete the last one to avoid holes */
-		last = (status.num_items - 1);
-		strcpy(status.status[num].item_name, status.status[last].item_name);
-		status.status[num].price = status.status[last].price;
-		status.status[num].times_sold = status.status[last].times_sold;
-		_delete_item(last);
-	} else {
-		/* Just delete it */
-		_delete_item(num);
-	}
-	status.num_items--;
+static void delete_item(void) {
+  int16_t num;
+  uint8_t last;
+  cprintf("\r Welcher Eintrag soll geloescht werden?\r\n");
+
+  num = cget_number(-1);
+  if (num < 0)
+    return;
+
+  if (status.num_items > 1) {
+    /* Swap last item with this one and delete the last one to avoid holes */
+    last = (status.num_items - 1);
+    strncpy(status.status[num].item_name, status.status[last].item_name,
+            MAX_ITEM_NAME_LENGTH);
+    status.status[num].price = status.status[last].price;
+    status.status[num].times_sold = status.status[last].times_sold;
+    _delete_item(last);
+  } else {
+    /* Just delete it */
+    _delete_item(num);
+  }
+  status.num_items--;
 }
 
 static void reset_counters(void) {
-	BYTE i;
+  BYTE i;
 
-	for (i = 0; i < status.num_items; i++) {
-		status.status[i].times_sold = 0;
-	}
+  for (i = 0; i < status.num_items; i++) {
+    status.status[i].times_sold = 0;
+  }
 }
 
-static void itemz_manager(){
-	char *c;
-	while(1){
-		itemz_print_screen();
-		c = get_input();
-		switch (*c) {
-			case 'n':
-				new_item(); break;
-			case 'd':
-				delete_item(); break;
-			case 's':
-				save_items(); break;
-			case 'r':
-				reset_counters(); break;
-			case 'm':
-				return; // switch to credit mode
-			case 'q':
-				exit(0);
-			default:
-				cprintf("Unbekannter Befehl, druecke RETURN...\r\n");
-				get_input(); 
-		}
-	}
+static void itemz_manager() {
+  char *c;
+  while (1) {
+    itemz_print_screen();
+    c = get_input();
+    switch (*c) {
+    case 'n':
+      new_item();
+      break;
+    case 'd':
+      delete_item();
+      break;
+    case 's':
+      save_items();
+      break;
+    case 'r':
+      reset_counters();
+      break;
+    case 'm':
+      return; // switch to credit mode
+    case 'q':
+      exit(0);
+    default:
+      cprintf("Unbekannter Befehl, druecke RETURN...\r\n");
+      cget_return();
+    }
+  }
 }
 
-int main() {
-	if (VIDEOMODE == 40)
-		toggle_videomode();
-	credits.num_items = 0;
-	status.num_items = 0;
-	cprintf("itemz loading...\n");
-	load_config();
-	cprintf("itemz: loading ITEMS...\n");
-	load_items();
-	cprintf("itemz: loading CREDITS...\n");
-	load_credits();
-	while (1) {
-		itemz_manager();
-		credit_manager();
-	}
-	return 0;
+int main(void) {
+  videomode(VIDEOMODE_80x25);
+
+  /*  clock CPU at double the speed (a whopping 2 Mhz!) */
+  fast();
+
+  credits.num_items = 0;
+  status.num_items = 0;
+  cprintf("itemz loading...\n");
+  load_config();
+  cprintf("itemz: loading ITEMS...\n");
+  load_items();
+  cprintf("itemz: loading CREDITS...\n");
+  load_credits();
+  while (1) {
+    itemz_manager();
+    credit_manager();
+  }
+  return 0;
 }