X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fitemz.c;h=274570f320555f40d16320408e0606852b4f840a;hb=a1dc471fac659fd6c939e1a36b93717f9e1d2caa;hp=caf23bf72472175cb530a6191f379a3d90f9dca6;hpb=91277a6a0f520ec37f71e41ee026fe1eaa9c233c;p=c128-kasse

diff --git a/src/itemz.c b/src/itemz.c
index caf23bf..274570f 100644
--- a/src/itemz.c
+++ b/src/itemz.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
  *
  * itemz.c: Verwaltet die ITEMS- und CREDITS-datei
@@ -16,33 +16,29 @@
 #include "config.h"
 #include "credit_manager.h"
 
-enum itemz_mode { MODE_ITEMS, MODE_CREDITS };
-
-static enum itemz_mode mode = MODE_ITEMS;
-
 static void itemz_print_screen() {
-	BYTE i, pages;
+	BYTE i;
 	char buffer[10];
 
 	clrscr();
-	cprintf("itemz (phil_fry, sECuRE, sur5r)\r\n\r\n");
+	cprintf("itemz (phil_fry, sECuRE, sur5r) v:" GV "\r\n\r\n");
 	cprintf("Datei: ITEMS\r\n\r\n");
 	for (i = 0; i < status.num_items; 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 %x: %s (%s, %d mal verkauft)\r\n",
+		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\r\n");
+	cprintf("\r\nn) Neu d) Loeschen s) Speichern m) Credit Modus q) Beenden\r\n");
 }
 
 static void new_item() {
 	char *input, *name;
 	int price;
 
-	if (status.num_items == 16) {
+	if (status.num_items == MAX_ITEMS) {
 		cprintf("\rEs ist bereits die maximale Anzahl an Eintraegen erreicht, druecke RETURN...\r\n");
 		input = get_input();
 		return;
@@ -58,7 +54,8 @@ static void new_item() {
 	cprintf("\r\nWie oft schon verkauft? [0] \r\n");
 	if ((input = get_input()) == NULL || *input == '\0')
 		return;
-	strcpy(status.status[status.num_items].item_name, name);
+	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++;
@@ -66,7 +63,7 @@ static void new_item() {
 }
 
 static void _delete_item(BYTE num) {
-	memset(status.status[num].item_name, '\0', 10);
+	memset(status.status[num].item_name, '\0', MAX_ITEM_NAME_LENGTH);
 	status.status[num].price = 0;
 	status.status[num].times_sold = 0;
 }
@@ -107,6 +104,8 @@ static void itemz_manager(){
 				save_items(); break;
 			case 'm':
 				return; // switch to credit mode
+			case 'q':
+				exit(0);
 			default:
 				cprintf("Unbekannter Befehl, druecke RETURN...\r\n");
 				get_input(); 
@@ -115,8 +114,8 @@ static void itemz_manager(){
 }
 
 int main() {
-	char *c;
-	toggle_videomode();
+	if (VIDEOMODE == 40)
+		toggle_videomode();
 	credits.num_items = 0;
 	status.num_items = 0;
 	cprintf("itemz loading...\n");