X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=samples%2Ffire.c;h=44eb07c880e5675e86c9a512e1f627095feabb16;hb=fa5b0d88c5f86bcc188a4519fa8c1dfb01760046;hp=7d2c4e9db494ac020bfb441b8b832195fec85ba1;hpb=c39022729d14906cfa4db4b680b52d344653ee1c;p=cc65

diff --git a/samples/fire.c b/samples/fire.c
index 7d2c4e9db..44eb07c88 100644
--- a/samples/fire.c
+++ b/samples/fire.c
@@ -1,16 +1,17 @@
-/*****************************************************************************
- * fire test program for cc65.                                               *
- *                                                                           *
- * (w)2002 by groepaz/hitmen                                                 *
- *                                                                           *
- * Cleanup and porting by Ullrich von Bassewitz.			     *
- *                                                                           *
- *****************************************************************************/
+/*****************************************************************************\
+** fire test program for cc65.                                               **
+**                                                                           **
+** (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
@@ -184,9 +186,9 @@ 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
-     * not interfere with our routine.
-     */
+    /* Save and change some flags, so that kernal/basic interrupt handler will
+    ** not interfere with our routine.
+    */
     initflag = *(unsigned char*) 0xA04;
     *(unsigned char*) 0xA04 &= 0xFE;
     graphflag = *(unsigned char*) 0xD8;
@@ -199,7 +201,7 @@ int main (void)
     /* Run the demo until a key was hit */
     t = clock ();
     while (!kbhit()) {
-	/* Build page 1, then make it visible */
+        /* Build page 1, then make it visible */
         fire (SCREEN1);
         waitvsync ();
         outb (&VIC.addr, PAGE1);