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/action/action_...


From: Martin Renold
Subject: [Stratagus-CVS] stratagus doc/ChangeLog.html src/action/action_...
Date: Tue, 07 Oct 2003 06:40:38 -0400

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Martin Renold <address@hidden>  03/10/07 06:40:37

Modified files:
        doc            : ChangeLog.html 
        src/action     : action_move.c 
        src/clone      : ccl.c clone.c unit.c 
        src/ui         : mouse.c 

Log message:
        removed NEW_SHIPS

Patches:
Index: stratagus/doc/ChangeLog.html
diff -u stratagus/doc/ChangeLog.html:1.548 stratagus/doc/ChangeLog.html:1.549
--- stratagus/doc/ChangeLog.html:1.548  Mon Oct  6 16:54:14 2003
+++ stratagus/doc/ChangeLog.html        Tue Oct  7 06:40:35 2003
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-----   $Id: ChangeLog.html,v 1.548 2003/10/06 20:54:14 martinxyz Exp $
+----   $Id: ChangeLog.html,v 1.549 2003/10/07 10:40:35 martinxyz Exp $
 
 ----   (c) Copyright 1998-2003 by Lutz Sammer
 
@@ -36,7 +36,8 @@
 <li>Future 2.00 Release<p>
     <ul>
     <li>++
-    <li>Allowing minimap transparency for undiscovered areas. (from Martin 
Renold).
+    <li>Removed NEW_SHIPS (from Martin Renold).
+    <li>Allowing minimap transparency for undiscovered areas (from Martin 
Renold).
     <li>Fixed Sync bug, qsort must return a unique answer, regardless of sort 
order (from Russell Smith and Jimmy Salmon).
     <li>Implemented task #2634: Removed Hard Coded Burning (from Jimmy Salmon).
     <li>Removed Mana 255 Limitation (from Russell Smith).
Index: stratagus/src/action/action_move.c
diff -u stratagus/src/action/action_move.c:1.67 
stratagus/src/action/action_move.c:1.68
--- stratagus/src/action/action_move.c:1.67     Fri Oct  3 16:31:24 2003
+++ stratagus/src/action/action_move.c  Tue Oct  7 06:40:36 2003
@@ -21,7 +21,7 @@
 //     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //     GNU General Public License for more details.
 //
-//     $Id: action_move.c,v 1.67 2003/10/03 20:31:24 jsalmon3 Exp $
+//     $Id: action_move.c,v 1.68 2003/10/07 10:40:36 martinxyz Exp $
 
 //@{
 
@@ -179,20 +179,9 @@
        unit->Frame = 0;
        UnitHeadingFromDeltaXY(unit, xd, yd);
     } else {
-#ifdef NEW_SHIPS
-       if (unit->Type->UnitType == UnitTypeLand) {
-           xd = Heading2X[unit->Direction / NextDirection];
-           yd = Heading2Y[unit->Direction / NextDirection];
-       } else {
-           xd = Heading2X[unit->Direction / NextDirection] * 2;
-           yd = Heading2Y[unit->Direction / NextDirection] * 2;
-       }
-       d = 0;
-#else
        xd = Heading2X[unit->Direction / NextDirection];
        yd = Heading2Y[unit->Direction / NextDirection];
        d = 0;
-#endif
     }
 
     DebugLevel3Fn(": %d,%d State %2d " _C_ xd _C_ yd _C_ unit->State);
Index: stratagus/src/clone/ccl.c
diff -u stratagus/src/clone/ccl.c:1.112 stratagus/src/clone/ccl.c:1.113
--- stratagus/src/clone/ccl.c:1.112     Tue Sep 30 19:19:48 2003
+++ stratagus/src/clone/ccl.c   Tue Oct  7 06:40:36 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl.c,v 1.112 2003/09/30 23:19:48 jsalmon3 Exp $
+//     $Id: ccl.c,v 1.113 2003/10/07 10:40:36 martinxyz Exp $
 
 //@{
 
@@ -929,9 +929,6 @@
 #ifdef HIERARCHIC_PATHFINDER
     gh_define("stratagus-feature-hierarchic-pathfinder",SCM_BOOL_T);
 #endif
-#ifdef NEW_SHIPS
-    gh_define("stratagus-feature-new-ships",SCM_BOOL_T);
-#endif
 #ifdef SLOW_INPUT
     gh_define("stratagus-feature-slow-input",SCM_BOOL_T);
 #endif
@@ -1022,7 +1019,7 @@
     }
 
     fprintf(fd,";;; -----------------------------------------\n");
-    fprintf(fd,";;; $Id: ccl.c,v 1.112 2003/09/30 23:19:48 jsalmon3 Exp $\n");
+    fprintf(fd,";;; $Id: ccl.c,v 1.113 2003/10/07 10:40:36 martinxyz Exp $\n");
 
     fprintf(fd,"(set-video-resolution! %d %d)\n", VideoWidth, VideoHeight);
     
@@ -1046,7 +1043,7 @@
     }
 
     fprintf(fd,";;; -----------------------------------------\n");
-    fprintf(fd,";;; $Id: ccl.c,v 1.112 2003/09/30 23:19:48 jsalmon3 Exp $\n");
+    fprintf(fd,";;; $Id: ccl.c,v 1.113 2003/10/07 10:40:36 martinxyz Exp $\n");
 
     // Global options
     if( OriginalFogOfWar ) {
@@ -1156,7 +1153,7 @@
     extern SCM oblistvar;
 
     CLprintf(file,"\n;;; -----------------------------------------\n");
-    CLprintf(file,";;; MODULE: CCL $Id: ccl.c,v 1.112 2003/09/30 23:19:48 
jsalmon3 Exp $\n\n");
+    CLprintf(file,";;; MODULE: CCL $Id: ccl.c,v 1.113 2003/10/07 10:40:36 
martinxyz Exp $\n\n");
 
     for(list = oblistvar; gh_list_p(list); list = gh_cdr(list) ) {
        SCM sym;
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.207 stratagus/src/clone/clone.c:1.208
--- stratagus/src/clone/clone.c:1.207   Mon Sep 29 22:53:01 2003
+++ stratagus/src/clone/clone.c Tue Oct  7 06:40:37 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: clone.c,v 1.207 2003/09/30 02:53:01 jsalmon3 Exp $
+//     $Id: clone.c,v 1.208 2003/10/07 10:40:37 martinxyz Exp $
 
 //@{
 
@@ -1224,9 +1224,6 @@
 #endif
 #ifdef NEW_MAPDRAW
     "NEW-MAPDRAW "
-#endif
-#ifdef NEW_SHIPS
-    "NEW-SHIPS "
 #endif
 #ifdef HIERARCHIC_PATHFINDER
     "HIERARCHIC-PATHFINDER "
Index: stratagus/src/clone/unit.c
diff -u stratagus/src/clone/unit.c:1.306 stratagus/src/clone/unit.c:1.307
--- stratagus/src/clone/unit.c:1.306    Sat Sep 27 02:16:36 2003
+++ stratagus/src/clone/unit.c  Tue Oct  7 06:40:37 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit.c,v 1.306 2003/09/27 06:16:36 mr-russ Exp $
+//     $Id: unit.c,v 1.307 2003/10/07 10:40:37 martinxyz Exp $
 
 //@{
 
@@ -460,15 +460,6 @@
 
     type=unit->Type;
 
-#ifdef NEW_SHIPS
-    //
-    // Sea and air units are 2 tiles aligned
-    //
-    if( type->UnitType==UnitTypeFly || type->UnitType==UnitTypeNaval ) {
-       x&=~1;
-       y&=~1;
-    }
-#endif
 
     unit->X=x;
     unit->Y=y;
@@ -1793,11 +1784,6 @@
     for( ;; ) {
 startw:
        for( i=addy; i--; y++ ) {
-#ifdef NEW_SHIPS
-           if( unit->Type->UnitType!=UnitTypeLand && ((x&1) || (y&1)) ) {
-               continue;
-           }
-#endif
            if( CheckedCanMoveToMask(x,y,mask) ) {
                goto found;
            }
@@ -1805,11 +1791,6 @@
        ++addx;
 starts:
        for( i=addx; i--; x++ ) {
-#ifdef NEW_SHIPS
-           if( unit->Type->UnitType!=UnitTypeLand && ((x&1) || (y&1)) ) {
-               continue;
-           }
-#endif
            if( CheckedCanMoveToMask(x,y,mask) ) {
                goto found;
            }
@@ -1817,11 +1798,6 @@
        ++addy;
 starte:
        for( i=addy; i--; y-- ) {
-#ifdef NEW_SHIPS
-           if( unit->Type->UnitType!=UnitTypeLand && ((x&1) || (y&1)) ) {
-               continue;
-           }
-#endif
            if( CheckedCanMoveToMask(x,y,mask) ) {
                goto found;
            }
@@ -1829,11 +1805,6 @@
        ++addx;
 startn:
        for( i=addx; i--; x-- ) {
-#ifdef NEW_SHIPS
-           if( unit->Type->UnitType!=UnitTypeLand && ((x&1) || (y&1)) ) {
-               continue;
-           }
-#endif
            if( CheckedCanMoveToMask(x,y,mask) ) {
                goto found;
            }
@@ -3746,7 +3717,7 @@
     int InRun, RunStart;
 
     CLprintf(file,"\n;;; -----------------------------------------\n");
-    CLprintf(file,";;; MODULE: units $Id: unit.c,v 1.306 2003/09/27 06:16:36 
mr-russ Exp $\n\n");
+    CLprintf(file,";;; MODULE: units $Id: unit.c,v 1.307 2003/10/07 10:40:37 
martinxyz Exp $\n\n");
 
     //
     // Local variables
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.151 stratagus/src/ui/mouse.c:1.152
--- stratagus/src/ui/mouse.c:1.151      Sat Oct  4 01:26:50 2003
+++ stratagus/src/ui/mouse.c    Tue Oct  7 06:40:37 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mouse.c,v 1.151 2003/10/04 05:26:50 jsalmon3 Exp $
+//     $Id: mouse.c,v 1.152 2003/10/07 10:40:37 martinxyz Exp $
 
 //@{
 
@@ -297,12 +297,6 @@
                    continue;
                }
 
-#ifdef NEW_SHIPS
-               if (unit->Type->UnitType != UnitTypeLand) {
-                   x &= ~1;
-                   y &= ~1;                    // Ships could only even fields
-               }
-#endif
            }
 
            // empty space
@@ -336,16 +330,6 @@
        //
        //      Ships
        //
-#ifdef NEW_SHIPS
-       if (action == MouseActionSail) {
-           x &= ~1;
-           y &= ~1;                    // Ships could only even fields
-       }
-       if (unit->Type->UnitType != UnitTypeLand) {
-           x &= ~1;
-           y &= ~1;                    // Ships could only even fields
-       }
-#endif
 
         if (type->Building) {
            if (dest && dest->Type->GivesResource) {




reply via email to

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