[Stratagus-CVS] stratagus/src/ui mainscr.c mouse.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/31 18:34:54

Modified files:
        src/ui         : mainscr.c mouse.c 

Log message:
        Fixed transporters

Patches:
Index: stratagus/src/ui/mainscr.c
diff -u stratagus/src/ui/mainscr.c:1.134 stratagus/src/ui/mainscr.c:1.135
--- stratagus/src/ui/mainscr.c:1.134    Thu Oct 23 21:58:34 2003
+++ stratagus/src/ui/mainscr.c  Fri Oct 31 18:34:53 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mainscr.c,v 1.134 2003/10/24 01:58:34 n0body Exp $
+//     $Id: mainscr.c,v 1.135 2003/10/31 23:34:53 jsalmon3 Exp $
 
 //@{
 
@@ -425,7 +425,7 @@
        uins = unit->UnitInside;
        for (i = 0; i < unit->InsideCount; ++i, uins = uins->NextContained) {
            DrawUnitIcon(unit->Player,uins->Type->Icon.Icon,
-               (ButtonAreaUnderCursor == ButtonAreaSelected && 
ButtonUnderCursor == i) ?
+               (ButtonAreaUnderCursor == ButtonAreaTransporting && 
ButtonUnderCursor == i) ?
                    (IconActive | (MouseButtons & LeftButton)) : 0,
                TheUI.TransportingButtons[i].X, TheUI.TransportingButtons[i].Y);
            UiDrawLifeBar(uins, TheUI.TransportingButtons[i].X, 
TheUI.TransportingButtons[i].Y);
Index: stratagus/src/ui/mouse.c
diff -u stratagus/src/ui/mouse.c:1.159 stratagus/src/ui/mouse.c:1.160
--- stratagus/src/ui/mouse.c:1.159      Fri Oct 31 01:18:56 2003
+++ stratagus/src/ui/mouse.c    Fri Oct 31 18:34:54 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: mouse.c,v 1.159 2003/10/31 06:18:56 jsalmon3 Exp $
+//     $Id: mouse.c,v 1.160 2003/10/31 23:34:54 jsalmon3 Exp $
 
 //@{
 
@@ -426,6 +426,20 @@
            CursorOn = CursorOnButton;
            MustRedraw |= RedrawButtonPanel;
            return;
+       }
+    }
+    if (NumSelected == 1 && Selected[0]->Type->Transporter && 
Selected[0]->InsideCount) {
+       for (i = Selected[0]->InsideCount - 1; i >= 0; --i) {
+           if (x >= TheUI.TransportingButtons[i].X &&
+                   x < TheUI.TransportingButtons[i].X + 
TheUI.TransportingButtons[i].Width + 7 &&
+                   y >= TheUI.TransportingButtons[i].Y &&
+                   y < TheUI.TransportingButtons[i].Y + 
TheUI.TransportingButtons[i].Height + 7) {
+               ButtonAreaUnderCursor = ButtonAreaTransporting;
+               ButtonUnderCursor = i;
+               CursorOn = CursorOnButton;
+               MustRedraw |= RedrawInfoPanel;
+               return;
+           }
        }
     }
     if (NumSelected == 1 && Selected[0]->Type->Building) {