improve formatting of the start screen

diff --git a/include/general.h b/include/general.h
index 4e45b297f80b09ea3751027ed625dddcc8536902..481c104ba0de783c8391535ba1a1e5d480f8f51b 100644 (file)
--- a/include/general.h
+++ b/include/general.h
@@ -12,4 +12,11 @@ extern BYTE _oserror;
 #define PEEKW(addr)        (*(unsigned*) (addr))
 
 #define VIDEOMODE (((* (BYTE *)0xD7) == 0x80) ? 80 : 40)
+
+/* because there is no macro expansion when stringifying, we need to use two
+ * levels of macros to stringify the value of a macro (for example
+ * MAX_ITEM_NAME_LENGTH) */
+#define xstr(s) str(s)
+#define str(s) #s
+
 #endif /*GENERAL_H_*/

diff --git a/src/kasse.c b/src/kasse.c
index 78f5ae75543ab07a9e4b93831efd42447dc41224..6996420aaf7d367b97ce6a3d7c8956343707afe0 100644 (file)
--- a/src/kasse.c
+++ b/src/kasse.c
@@ -38,11 +38,17 @@ static void print_screen() {
        }
        cprintf("C128-Kassenprogramm (phil_fry, sECuRE, sur5r) v:" GV "\r\
 \r\nUhrzeit: %s (wird nicht aktualisiert)\r\
-Eingenommen: %s, Verkauft: %ld Flaschen, Drucken: %s\r\n\r\n", 
+Eingenommen: %s, Verkauft: %ld Dinge, Drucken: %s\r\n\r\n",
        time, profit, items_sold, (printing == 1 ? "ein" : "aus"));
-       for (; i < status.num_items; ++i)
-               cprintf("Eintrag %2d: %s (%d Cents, %d mal verkauft)\r\n",
-                       i, status.status[i].item_name, status.status[i].price, status.status[i].times_sold);
+       for (; i < status.num_items; ++i) {
+               if (format_euro(profit, sizeof(profit), status.status[i].price) == NULL) {
+                       cprintf("Preis %ld konnte nicht umgerechnet werden\r\n", status.status[i].price);
+                       exit(1);
+               }
+
+               cprintf("Eintrag %2d: %-" xstr(MAX_ITEM_NAME_LENGTH) "s (%s, %d mal verkauft)\r\n",
+                       i, status.status[i].item_name, profit, status.status[i].times_sold);
+       }
        cprintf("\r\nBefehle: s) Daten sichern d) Drucken umschalten\r\
 g) Guthabenverwaltung     z) Zeit setzen\r\
 f) Freitext verkaufen     q) Beenden\r\n");
@@ -69,7 +75,7 @@ static void print_log(char *name, int item_price, int einheiten, char *nickname,
                exit(1);
        }
 
-       sprintf(print_buffer, "%c[%lu] %s - %-9s - %s - r %s - %d - an %s\r",  17,
+       sprintf(print_buffer, "%c[%lu] %s - %-" xstr(MAX_ITEM_NAME_LENGTH) "s - %s - r %s - %d - an %s\r",  17,
                        items_sold, time, name, price, rest,
                        einheiten, (*nickname != '\0' ? nickname : "Unbekannt"));
        print_the_buffer();