From 8c168a56e5be294927961827491e2fd41bb582d4 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Wed, 28 Mar 2001 16:02:20 +0000
Subject: [PATCH] Prepared NEW_NAMES.
---
src/unit/unit_draw.cpp | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/unit/unit_draw.cpp b/src/unit/unit_draw.cpp
index 2d6d01b92..2895cfa19 100644
--- a/src/unit/unit_draw.cpp
+++ b/src/unit/unit_draw.cpp
@@ -258,23 +258,35 @@ typedef struct _decoration_ {
/**
** Sprite to display the mana.
*/
-global Decoration ManaSprite = {
- "mana.png", -7,-7, 7,7
-};
+global Decoration ManaSprite
+#ifndef USE_CCL
+ = { "mana.png", -7,-7, 7,7 }
+#endif
+ ;
/**
** Sprite to display the health.
*/
-global Decoration HealthSprite = {
- "health.png", 0,-7, 7,7
-};
+global Decoration HealthSprite
+#ifndef USE_CCL
+ = { "health.png", 0,-7, 7,7 }
+#endif
+ ;
/**
** Sprite to display the shadow of flying units.
+**
+** @todo Made this configurable with CCL.
*/
-global Decoration ShadowSprite = {
- "graphic/unit shadow.png", 0,42, 32,32
-};
+global Decoration ShadowSprite
+#ifndef laterUSE_CCL
+#ifdef NEW_NAMES
+ = { "graphics/missiles/unit shadow.png", 0,42, 32,32 };
+#else
+ = { "graphic/unit shadow.png", 0,42, 32,32 };
+#endif
+#endif
+ ;
/**
** Sprite to display the active spells on units.
@@ -339,7 +351,12 @@ global void LoadDecorations(void)
ShadowSprite.Sprite=LoadSprite(ShadowSprite.File
,ShadowSprite.Width,ShadowSprite.Height);
// FIXME: make this configurable
+#ifdef NEW_NAMES
+ SpellSprites=LoadSprite("graphics/ui/bloodlust,haste,slow,invisible,shield.png"
+ ,16,16);
+#else
SpellSprites=LoadSprite("graphic/bloodlust,haste,slow,invis.,shield.png",16,16);
+#endif
}
#ifdef REFS_DEBUG