stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus/src include/master.h video/linedraw.c


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src include/master.h video/linedraw.c
Date: 1 Feb 2004 00:54:07 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/02/01 00:54:07

Modified files:
        src/include    : master.h 
        src/video      : linedraw.c 

Log message:
        Fix circle drawing, again:)

Patches:
Index: stratagus/src/include/master.h
diff -u stratagus/src/include/master.h:1.15 stratagus/src/include/master.h:1.16
--- stratagus/src/include/master.h:1.15 Mon Dec 22 15:54:06 2003
+++ stratagus/src/include/master.h      Sun Feb  1 00:54:06 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: master.h,v 1.15 2003/12/22 04:54:06 wizzard Exp $
+//      $Id: master.h,v 1.16 2004/01/31 13:54:06 nobody_ Exp $
 
 #ifndef __MASTER_H__
 #define __MASTER_H__
@@ -41,7 +41,7 @@
 --  Defines
 ----------------------------------------------------------------------------*/
 
-#define MASTER_HOST "mohydine.no-ip.com"
+#define MASTER_HOST "nobody.gotdns.org"
 #define MASTER_PORT 7775
 
 /*----------------------------------------------------------------------------
Index: stratagus/src/video/linedraw.c
diff -u stratagus/src/video/linedraw.c:1.71 stratagus/src/video/linedraw.c:1.72
--- stratagus/src/video/linedraw.c:1.71 Sat Jan 24 02:03:36 2004
+++ stratagus/src/video/linedraw.c      Sun Feb  1 00:54:06 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: linedraw.c,v 1.71 2004/01/23 15:03:36 nobody_ Exp $
+//      $Id: linedraw.c,v 1.72 2004/01/31 13:54:06 nobody_ Exp $
 
 //@{
 
@@ -853,6 +853,7 @@
                        p += 2 * px + 3;
                } else {
                        p += 2 * (px - py) + 5;
+                       py -= 1;
                        // Fill up the left/right half of the circle
                        if (py >= px) {
                                VideoDrawVLine(color, x + py + 1, y, px + 1);
@@ -860,7 +861,6 @@
                                VideoDrawVLine(color, x - py - 1, y, px + 1);
                                VideoDrawVLine(color, x - py - 1, y - px,  px);
                        }
-                       py -= 1;
                }
        }
 }
@@ -878,7 +878,7 @@
        p = 1 - r;
        py = r;
 
-       for (px = 0; px <= py + 1; ++px) {
+       for (px = 0; px <= py; ++px) {
 
                // Fill up the middle half of the circle
                VideoDrawTransVLine(color, x + px, y, py + 1, alpha);
@@ -892,14 +892,14 @@
                        p += 2 * px + 3;
                } else {
                        p += 2 * (px - py) + 5;
+                       py -= 1;
                        // Fill up the left/right half of the circle
                        if (py >= px) {
-                               VideoDrawTransVLine(color, x + py + 2, y, px + 
1, alpha);
-                               VideoDrawTransVLine(color, x + py + 2, y - px, 
px, alpha);
-                               VideoDrawTransVLine(color, x - py - 2, y, px + 
1, alpha);
-                               VideoDrawTransVLine(color, x - py - 2, y - px,  
px, alpha);
+                               VideoDrawTransVLine(color, x + py + 1, y, px + 
1, alpha);
+                               VideoDrawTransVLine(color, x + py + 1, y - px, 
px, alpha);
+                               VideoDrawTransVLine(color, x - py - 1, y, px + 
1, alpha);
+                               VideoDrawTransVLine(color, x - py - 1, y - px,  
px, alpha);
                        }
-                       py -= 1;
                }
        }
 }
@@ -930,6 +930,7 @@
                        p += 2 * px + 3;
                } else {
                        p += 2 * (px - py) + 5;
+                       py -= 1;
                        // Fill up the left/right half of the circle
                        if (py >= px) {
                                VideoDrawVLineClip(color, x + py + 1, y, px + 
1);
@@ -937,7 +938,6 @@
                                VideoDrawVLineClip(color, x - py - 1, y, px + 
1);
                                VideoDrawVLineClip(color, x - py - 1, y - px,  
px);
                        }
-                       py -= 1;
                }
        }
 }
@@ -955,7 +955,7 @@
        p = 1 - r;
        py = r;
 
-       for (px = 0; px <= py + 1; ++px) {
+       for (px = 0; px <= py; ++px) {
 
                // Fill up the middle half of the circle
                VideoDrawTransVLineClip(color, x + px, y, py + 1, alpha);
@@ -969,6 +969,7 @@
                        p += 2 * px + 3;
                } else {
                        p += 2 * (px - py) + 5;
+                       py -= 1;
                        // Fill up the left/right half of the circle
                        if (py >= px) {
                                VideoDrawTransVLineClip(color, x + py + 1, y, 
px + 1, alpha);
@@ -976,7 +977,6 @@
                                VideoDrawTransVLineClip(color, x - py - 1, y, 
px + 1, alpha);
                                VideoDrawTransVLineClip(color, x - py - 1, y - 
px,  px, alpha);
                        }
-                       py -= 1;
                }
        }
 }
@@ -1750,7 +1750,7 @@
        p = 1 - r;
        py = r;
 
-       for (px = 0; px <= py + 1; ++px) {
+       for (px = 0; px <= py; ++px) {
 
                // Fill up the middle half of the circle
                VideoDrawTransVLine(color, x + px, y, py + 1, alpha);
@@ -1764,6 +1764,7 @@
                        p += 2 * px + 3;
                } else {
                        p += 2 * (px - py) + 5;
+                       py -= 1;
                        // Fill up the left/right half of the circle
                        if (py >= px) {
                                VideoDrawTransVLine(color, x + py + 1, y, px + 
1, alpha);
@@ -1771,7 +1772,6 @@
                                VideoDrawTransVLine(color, x - py - 1, y, px + 
1, alpha);
                                VideoDrawTransVLine(color, x - py - 1, y - px,  
px, alpha);
                        }
-                       py -= 1;
                }
        }
 }
@@ -1786,7 +1786,7 @@
        p = 1 - r;
        py = r;
 
-       for (px = 0; px <= py + 1; ++px) {
+       for (px = 0; px <= py; ++px) {
 
                // Fill up the middle half of the circle
                VideoDrawTransVLineClip(color, x + px, y, py + 1, alpha);
@@ -1800,6 +1800,7 @@
                        p += 2 * px + 3;
                } else {
                        p += 2 * (px - py) + 5;
+                       py -= 1;
                        // Fill up the left/right half of the circle
                        if (py >= px) {
                                VideoDrawTransVLineClip(color, x + py + 1, y, 
px + 1, alpha);
@@ -1807,7 +1808,6 @@
                                VideoDrawTransVLineClip(color, x - py - 1, y, 
px + 1, alpha);
                                VideoDrawTransVLineClip(color, x - py - 1, y - 
px,  px, alpha);
                        }
-                       py -= 1;
                }
        }
 }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]