[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/unit unit_draw.c
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src/unit unit_draw.c |
Date: |
24 Jan 2004 09:01:40 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/24 09:01:40
Modified files:
src/unit : unit_draw.c
Log message:
Fixed Upgrade Frame Usage, frame still hard coded
Patches:
Index: stratagus/src/unit/unit_draw.c
diff -u stratagus/src/unit/unit_draw.c:1.214
stratagus/src/unit/unit_draw.c:1.215
--- stratagus/src/unit/unit_draw.c:1.214 Thu Jan 22 17:18:24 2004
+++ stratagus/src/unit/unit_draw.c Sat Jan 24 09:01:40 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unit_draw.c,v 1.214 2004/01/22 06:18:24 wizzard Exp $
+// $Id: unit_draw.c,v 1.215 2004/01/23 22:01:40 wizzard Exp $
//@{
@@ -644,7 +644,7 @@
{
#if 0
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.214
2004/01/22 06:18:24 wizzard Exp $\n\n");
+ CLprintf(file, ";;; MODULE: decorations $Id: unit_draw.c,v 1.215
2004/01/23 22:01:40 wizzard Exp $\n\n");
CLprintf(file, "(mana-sprite \"%s\" %d %d %d %d)\n",
ManaSprite.File, ManaSprite.HotX, ManaSprite.HotY,
@@ -1906,6 +1906,10 @@
state = (unit->Orders[0].Action == UnitActionBuilded) |
((unit->Orders[0].Action == UnitActionUpgradeTo) << 1);
constructed = unit->Constructed;
+ // Reset Type to the type being upgraded to
+ if (state == 2) {
+ type = unit->Orders[0].Type;
+ }
// This is trash unless the unit is being built, and that's
when we use it.
cframe = unit->Data.Builded.Frame;
} else {