src/render-cg/gint_dline.c

@@ -15,19 +15,14 @@ void gint_dhline(int x1, int x2, int y, int color)
 	int offset = DWIDTH * y;
 
 	/* Use longwords to do the copy, but first paint the endpoints to heed
-	   for odd x1 and x2. Checking the parity may be a waste of time for
+	   for odd x1 and x2. Checking the parity may be a waste of time. */
-	   "real" color, but must be checked when C_INVERT in involved to
+    if (color != C_INVERT) {
-	   avoid "cancelling" invert effect with potential overdraw of the
+	    gint_vram[offset + x1] = color;
-	   next operation. */
+	    gint_vram[offset + x2] = color;
-	if (color != C_INVERT) {
+    } else {
-		gint_vram[offset + x1] = color;
+	    gint_vram[offset + x1] ^= 0xffff;
-		gint_vram[offset + x2] = color;
+	    gint_vram[offset + x2] ^= 0xffff;
-	} else {
+    }
-		if (x1 & 1)
-			gint_vram[offset + x1] ^= 0xffff;
-		if (x2 & 1)
-			gint_vram[offset + x2] ^= 0xffff;
-	}
 
 	/* Now round to longword boundaries and copy everything in-between with
 	   longwords */
@@ -37,12 +32,12 @@ void gint_dhline(int x1, int x2, int y, int color)
 	uint32_t *start = (void *)(gint_vram + offset + x1);
 	uint32_t *end   = (void *)(gint_vram + offset + x2);
 
-	if (color != C_INVERT) {
+    if (color != C_INVERT) {
-		uint32_t op = (color << 16) | color;
+	    uint32_t op = (color << 16) | color;
-		while(end > start) *--end = op;
+	    while(end > start) *--end = op;
-	} else {
+    } else {
-		while(end > start) *--end ^= 0xffffffff;
+	    while(end > start) *--end ^= 0xffffffff;
-	}
+    }
 }
 
 /* gint_dvline(): Optimized vertical line */
@@ -56,11 +51,11 @@ void gint_dvline(int y1, int y2, int x, int color)
 	uint16_t *v = gint_vram + DWIDTH * y1 + x;
 	int height = y2 - y1 + 1;
 
-	if (color != C_INVERT) {
+    if (color != C_INVERT) {
-		while(height-- > 0) *v = color, v += DWIDTH;
+	    while(height-- > 0) *v = color, v += DWIDTH;
-	} else {
+    } else {
-		while(height-- > 0) *v ^= 0xffff, v += DWIDTH;
+	    while(height-- > 0) *v ^= 0xffff, v += DWIDTH;
-	}
+    }
 }
 
 #endif