Fixed a bug: The floppies do not like ,R (for read mode) when opening the

[cc65] / samples / fire.c

diff --git a/samples/fire.c b/samples/fire.c
index a4810f88e91a201288c21809022dc246f5d96121..bbea872cf1c92adb17a44345f4451d67d2b9a3d6 100644 (file)
--- a/samples/fire.c
+++ b/samples/fire.c
@@ -4,13 +4,14 @@
  * (w)2002 by groepaz/hitmen                                                 *
  *                                                                           *
  * Cleanup and porting by Ullrich von Bassewitz.                            *
+ * 2004-06-08, Greg King                                                     *
  *                                                                           *
  *****************************************************************************/
 
 
 
 /* sync page-flipping to vertical blank */
-//#define DOVSYNC
+/* #define DOVSYNC */
 
 #include <stdlib.h>
 #include <string.h> /* for memset */
@@ -25,14 +26,15 @@
 #  define SCREEN2               0xE400
 #  define CHARSET               0xE800
 #  define COLORRAM              0xD800
-#  define outb(addr,val)               (*(addr)) = (val)
+#  define outb(addr,val)               (*(addr) = (val))
 #  define inb(addr)             (*(addr))
 #elif defined(__C128__)
+#  define BUFFER                0x0400
 #  define SCREEN1               0xE000
 #  define SCREEN2               0xE400
 #  define CHARSET               0xE800
 #  define COLORRAM              0xD800
-#  define outb(addr,val)               (*(addr)) = (val)
+#  define outb(addr,val)               (*(addr) = (val))
 #  define inb(addr)             (*(addr))
 #elif defined(__CBM510__)
 #  define BUFFER                0xF800
@@ -53,12 +55,12 @@
 
 
 /* Use static local variables for speed */
-#pragma staticlocals (1);
+#pragma static-locals (1);
 
 
 
 #ifdef DOVSYNC
-#  define waitvsync() while(VIC.ctrl1 < 0x80) {}
+#  define waitvsync() while ((signed char)VIC.ctrl1 >= 0)
 #else
 #  define waitvsync()
 #endif
@@ -67,14 +69,12 @@
 
 static void makechar (void)
 {
-    char *font;
-
     static const unsigned char bittab[8] = {
         0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
     };
-    unsigned char i, ii, b;
-    int  c;
-    int  s,bc;
+    register char *font;
+    register unsigned char i, ii, b, bc;
+    unsigned char c;
 
     gotoxy (0, 1);
 
@@ -87,12 +87,11 @@ static void makechar (void)
 
 
     for (c = 0; c < 0x40; ++c) {
-        s = c;
         bc = 0;
         for (i = 0; i < 8; i++){
             b = 0;
             for (ii = 0; ii < 8; ii++) {
-                bc += s;
+                bc += c;
                 if (bc > 0x3f) {
                     bc = bc - 0x40;
                     b += bittab[(ii + (i & 1)) & 0x7];
@@ -187,7 +186,7 @@ int main (void)
     outb (&CIA2.pra, (block & 0xFC) | ((SCREEN1 >> 14) ^ 0x03));
 #endif
 #if defined(__C128__)
-    /* Save and change some flags, so that kernal/basic interupt handler will
+    /* Save and change some flags, so that kernal/basic interrupt handler will
      * not interfere with our routine.
      */
     initflag = *(unsigned char*) 0xA04;