stratagus-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus doc/ChangeLog.html src/clone/unit.c s...

From: Russell Smith
Subject: [Stratagus-CVS] stratagus doc/ChangeLog.html src/clone/unit.c s...
Date: Sat, 08 Nov 2003 01:54:03 -0500 
CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Russell Smith <address@hidden>  03/11/08 01:54:03

Modified files:
        doc            : ChangeLog.html 
        src/clone      : unit.c unit_draw.c 

Log message:
        Fixed Bug #6301: Fog of War problem after using Holy Vision

Patches:
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.568 stratagus/doc/ChangeLog.html:1.569
--- stratagus/doc/ChangeLog.html:1.568  Thu Nov  6 02:10:58 2003
+++ stratagus/doc/ChangeLog.html        Sat Nov  8 01:54:02 2003
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-----   $Id: ChangeLog.html,v 1.568 2003/11/06 07:10:58 mr-russ Exp $
+----   $Id: ChangeLog.html,v 1.569 2003/11/08 06:54:02 mr-russ Exp $
 
 ----   (c) Copyright 1998-2003 by Lutz Sammer
 
@@ -36,6 +36,7 @@
 <li>Future 2.00 Release<p>
     <ul>
     <li>++
+    <li>Fixed Bug #6301: Fog of War problem after using Holy Vision (from 
Russell Smith).
     <li>Fixed Bug #6306: DebugCheck at src/clone/unit_draw.c:895 (from Russell 
Smith).
     <li>Allow selection of more than 9 units (from Nehal Mistry).
     <li>Upgraded Network Code, Variable packet size and don't send repeat 
commands (from Russell Smith).
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.327 stratagus/src/clone/unit.c:1.328
--- stratagus/src/clone/unit.c:1.327    Fri Nov  7 15:02:07 2003
+++ stratagus/src/clone/unit.c  Sat Nov  8 01:54:03 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit.c,v 1.327 2003/11/07 20:02:07 n0body Exp $
+//     $Id: unit.c,v 1.328 2003/11/08 06:54:03 mr-russ Exp $
 
 //@{
 
@@ -1036,12 +1036,16 @@
            unit->SeenIY = unit->IY;
            unit->SeenIX = unit->IX;
            unit->SeenFrame = unit->Frame;
-           unit->SeenType = unit->Type;
            unit->SeenState = (unit->Orders[0].Action == UnitActionBuilded) |
                ((unit->Orders[0].Action == UnitActionUpgradeTo) << 1);
            if (unit->Orders[0].Action == UnitActionDie) {
                unit->SeenState = 3;
            }
+           if (unit->SeenState == 2) {
+               unit->SeenType = unit->Orders[0].Type;
+           } else {
+               unit->SeenType = unit->Type;
+           }
            unit->SeenConstructed = unit->Constructed;
            unit->SeenDestroyed = unit->Destroyed;
            --n;
@@ -1074,12 +1078,16 @@
                        unit->Slot _C_ unit->X _C_ unit->Y _C_ GameCycle);
                }
                unit->SeenFrame = unit->Frame;
-               unit->SeenType = unit->Type;
                unit->SeenState = (unit->Orders[0].Action == UnitActionBuilded) 
|
                    ((unit->Orders[0].Action == UnitActionUpgradeTo) << 1);
                if (unit->Orders[0].Action == UnitActionDie) {
                    unit->SeenState = 3;
                }
+               if (unit->SeenState == 2) {
+                   unit->SeenType = unit->Orders[0].Type;
+               } else {
+                   unit->SeenType = unit->Type;
+               }
                unit->SeenConstructed = unit->Constructed;
                unit->SeenDestroyed = unit->Destroyed;
                x = unit->Type->TileWidth;
@@ -3747,7 +3755,7 @@
     int RunStart;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.327 2003/11/07 20:02:07 
n0body Exp $\n\n");
+    CLprintf(file, ";;; MODULE: units $Id: unit.c,v 1.328 2003/11/08 06:54:03 
mr-russ Exp $\n\n");
 
     //
     // Local variables
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.175 
stratagus/src/clone/unit_draw.c:1.176
--- stratagus/src/clone/unit_draw.c:1.175       Wed Oct 29 22:46:02 2003
+++ stratagus/src/clone/unit_draw.c     Sat Nov  8 01:54:03 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit_draw.c,v 1.175 2003/10/30 03:46:02 n0body Exp $
+//     $Id: unit_draw.c,v 1.176 2003/11/08 06:54:03 mr-russ Exp $
 
 //@{
 
@@ -583,7 +583,7 @@
 global void SaveDecorations(CLFile* file)
 {
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.175 
2003/10/30 03:46:02 n0body Exp $\n\n");
+    CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.176 
2003/11/08 06:54:03 mr-russ Exp $\n\n");
 
     CLprintf(file, "(mana-sprite \"%s\"  %d %d  %d %d)\n",
        ManaSprite.File, ManaSprite.HotX, ManaSprite.HotY,
@@ -1829,10 +1829,10 @@
     //
     } else if (state == 2) {
        // FIXME: this frame is hardcoded!!!
-       GraphicUnitPixels(unit, unit->Orders[0].Type->Sprite);
-       DrawUnitType(unit->Orders[0].Type, frame < 0 ? -1 : 1, x, y);
+       GraphicUnitPixels(unit, type->Sprite);
+       DrawUnitType(type, frame < 0 ? -1 : 1, x, y);
 #ifdef USE_OPENGL
-       DrawUnitPlayerColor(unit->Orders[0].Type, unit->Player->Player,
+       DrawUnitPlayerColor(type, unit->Player->Player,
            frame < 0 ? -1 : 1, x, y);
 #endif
     } else {
reply via email to
[Prev in Thread] Current Thread [Next in Thread]