CGE: cleanup in jbw.h

6 files changed, 12 insertions, 47 deletions

diff --git a/engines/cge/btfile.h b/engines/cge/btfile.h
index 1ac093d897..1f3d7217ce 100644
--- a/engines/cge/btfile.h
+++ b/engines/cge/btfile.h
@@ -32,7 +32,7 @@
 
 namespace CGE {
 
-#define BT_SIZE     K(1)
+#define BT_SIZE     1024
 #define BT_KEYLEN   13
 #define BT_LEVELS   2
 
diff --git a/engines/cge/cfile.h b/engines/cge/cfile.h
index 490e120afa..b5bf9da603 100644
--- a/engines/cge/cfile.h
+++ b/engines/cge/cfile.h
@@ -33,10 +33,7 @@
 namespace CGE {
 
 #define LINE_MAX    512
-
-#ifndef IOBUF_SIZE
-#define IOBUF_SIZE  K(2)
-#endif
+#define IOBUF_SIZE  2048
 
 #define CFREAD(x)   read((uint8 *)(x),sizeof(*(x)))
 
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 527d075ade..3958225583 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -54,7 +54,7 @@
 
 namespace CGE {
 
-#define STACK_SIZ   (K(2))
+#define STACK_SIZ   2048
 #define SVGCHKSUM   (1956 + _now + _oldLev + _game + _music + _demoText)
 
 #define SVG0NAME    ("{{INIT}}" SVG_EXT)
diff --git a/engines/cge/general.cpp b/engines/cge/general.cpp
index 25b7cc25a5..8639c66653 100644
--- a/engines/cge/general.cpp
+++ b/engines/cge/general.cpp
@@ -100,12 +100,12 @@ void _fqsort(void *base, uint16 nelem, uint16 width, int (*fcmp)(const void *, c
 }
 
 const char *progName(const char *ext) {
-	static char buf[MAXFILE];
+	static char buf[kMaxFile];
 	strcpy(buf, "CGE");
 	if (ext) {
 		strcat(buf, ".");
 		if (*ext == '.')
-			++ext;
+			ext++;
 		strcat(buf, ext);
 	}
 
diff --git a/engines/cge/jbw.h b/engines/cge/jbw.h
index 89bcb2b03e..d555c82c5a 100644
--- a/engines/cge/jbw.h
+++ b/engines/cge/jbw.h
@@ -39,33 +39,11 @@ namespace CGE {
 #define BMP_MODE 0
 //
 
-#define BEL      7
-#define BS       8
-#define HT       9
-#define LF      10
-#define FF      12
-#define CR      13
-#define MAXFILE 128
+#define kMaxFile      128
 
-#define IsWhite(c)  ((c) == ' ' || (c) == '\t' || (c) == '\n')
-#define IsUpper(c)  ((c) >= 'A' && (c) <= 'Z')
-#define IsLower(c)  ((c) >= 'a' && (c) <= 'z')
-#define IsDigit(c)  ((c) >= '0' && (c) <= '9')
-#define IsAlpha(c)  (IsLower(c) || IsUpper(c) || (c) == '_')
-#define IsAlNum(c)  (IsAlpha(c) || IsDigit(c))
-#define IsHxDig(c)  (IsDigit(c) || ((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
-
-#define ArrayCount(a)   (sizeof(a) / sizeof((a)[0]))
-#define MAX_TIMER   0x1800B0L
-
-typedef void (MouseFunType)();
-
-#define Lo(d)       (((int *) &d)[0])
-#define Hi(d)       (((int *) &d)[1])
-#define LoWord(d)   ((uint16) Lo(d))
-#define HiWord(d)   ((uint16) Hi(d))
-#define K(n)        (1024 * (n))
-#define MASK(n)     ((1 << n) - 1)
+#define IsDigit(c)    ((c) >= '0' && (c) <= '9')
+#define IsHxDig(c)    (IsDigit(c) || ((c) >= 'A' && (c) <= 'F') || ((c) >= 'a' && (c) <= 'f'))
+#define ArrayCount(a) (sizeof(a) / sizeof((a)[0]))
 
 enum Keys {
     NoKey   = 0, CtrlA, CtrlB, CtrlC, CtrlD, CtrlE, CtrlF, CtrlG, CtrlH,
@@ -113,18 +91,8 @@ enum Keys {
     TwiceRight
 };
 
-#define HGC_Cursor  0x0B0C
-#define CGA_Cursor  0x0607
-#define OFF_Cursor  0x2000
-
-//#define TimerCount  (*((volatile long *) ((void _seg *) 0x40 + (void *) 0x6C)))
-//#define BreakFlag   (*((volatile uint8 *) ((void _seg *) 0x40 + (void *) 0x71)))
-//#define PostFlag    (*((volatile uint16 *) ((void _seg *) 0x40 + (void *) 0x72)))
-//#define POST        ((void (*)(void)) ((void _seg *) 0xF000 + (void *) 0xFFF0))
-
-
-extern  uint16  _stklen;
-extern  uint16  _heaplen;
+//extern  uint16  _stklen;
+//extern  uint16  _heaplen;
 
 } // End of namespace CGE
 
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index 6b56217a1e..26969e7031 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -191,7 +191,7 @@ public:
 	uint8 _takePtr;
 	int _seqPtr;
 	int _shpCnt;
-	char _file[MAXFILE];
+	char _file[kMaxFile];
 	Sprite *_prev;
 	Sprite *_next;