fix off-by-one in item display

[c128-kasse] / include / general.h

diff --git a/include/general.h b/include/general.h
index 0ddefcfa9278b58b60bd3bb36da6d4433364fbd5..5691400f6a6e42103c945042d012b705b4983e40 100644 (file)
--- a/include/general.h
+++ b/include/general.h
@@ -2,7 +2,8 @@
 #define GENERAL_H_
 typedef unsigned char BYTE;
 char *get_input();
-char * format_euro(char * s, int maxlen, int cent);
+char retry_or_quit();
+char *format_euro(char * s, int maxlen, int cent);
 void c128_perror(BYTE, char*);
 extern BYTE _oserror;
 #define POKE(addr,val)     (*(unsigned char*) (addr) = (val))
@@ -10,5 +11,36 @@ extern BYTE _oserror;
 #define PEEK(addr)         (*(unsigned char*) (addr))
 #define PEEKW(addr)        (*(unsigned*) (addr))
 
+/* C128 color codes, see PDF page 127 of
+ * http://www.pagetable.com/docs/Commodore%20128%20Programmer%27s%20Reference%20Guide.pdf */
+#define TC_BLACK        0
+#define TC_WHITE        1
+#define TC_RED          2
+#define TC_CYAN         3
+#define TC_PURPLE       4
+#define TC_GREEN        5
+#define TC_BLUE         6
+#define TC_YELLOW       7
+#define TC_ORANGE       8
+#define TC_BROWN        9
+/* This is the good red */
+#define TC_LIGHT_RED   10
+#define TC_DARK_GRAY   11
+#define TC_MEDIUM_GRAY 12
+/* This is the good green */
+#define TC_LIGHT_GREEN 13
+#define TC_LIGHT_BLUE  14
+#define TC_LIGHT_GRAY  15
+
 #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
+
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#define min(a, b) ((a) > (b) ? (b) : (a))
+
 #endif /*GENERAL_H_*/