fixed font configuration

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 5e14001b8454e922348c7260ffd7bbdec9b1e95b..20579d817c0f8e1c871d7bf48765374225110ad3 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -173,8 +173,8 @@ int main(int argc, char **argv) {
                normalFont.MapRange('a', 'm', 0, 3);
                normalFont.MapRange('n', 'z', 0, 4);
                normalFont.MapChar(':', 10, 0);
-               normalFont.MapChar('!', 10, 0);
-               normalFont.MapChar('?', 10, 0);
+               normalFont.MapChar('!', 11, 0);
+               normalFont.MapChar('?', 12, 0);
                // TODO: add '.' and '-' characters
                battleRes.normalFont = &normalFont;
 
@@ -186,8 +186,8 @@ int main(int argc, char **argv) {
                disabledFont.MapRange('a', 'm', 0, 3);
                disabledFont.MapRange('n', 'z', 0, 4);
                disabledFont.MapChar(':', 10, 0);
-               disabledFont.MapChar('!', 10, 0);
-               disabledFont.MapChar('?', 10, 0);
+               disabledFont.MapChar('!', 11, 0);
+               disabledFont.MapChar('?', 12, 0);
                // TODO: add '.' and '-' characters
                battleRes.disabledFont = &disabledFont;
 
@@ -197,11 +197,12 @@ int main(int argc, char **argv) {
 
                SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png"));
                Sprite weaponTargetCursor(targetingIconsImg, 32, 32);
+               Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
                battleRes.weaponTargetCursor = &weaponTargetCursor;
                // TODO: add image for magic targeting cursor
                battleRes.magicTargetCursor = &weaponTargetCursor;
                // TODO: add image for item targeting cursor
-               battleRes.itemTargetCursor = &weaponTargetCursor;
+               battleRes.itemTargetCursor = &itemTargetCursor;
 
                battleRes.spellMenuHeadline = "Please choose a spell.";
                battleRes.spellMenuPrototype = Menu</* Spell */ void *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 0, 2, 32);
@@ -244,16 +245,19 @@ int main(int argc, char **argv) {
                antidote.SetName("Antidote");
                antidote.SetMenuIcon(&potionIcon);
                antidote.SetUsableInBattle();
+               antidote.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE);
                inventory.Add(&antidote, 9);
                Item magicJar;
                magicJar.SetName("Magic jar");
                magicJar.SetMenuIcon(&potionIcon);
                magicJar.SetUsableInBattle();
+               magicJar.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE);
                inventory.Add(&magicJar, 4);
                Item hiPotion;
                hiPotion.SetName("Hi-Potion");
                hiPotion.SetMenuIcon(&potionIcon);
                hiPotion.SetUsableInBattle();
+               hiPotion.SetTargettingMode(Item::TARGETTING_MODE_ALLY | Item::TARGETTING_MODE_ONE);
                inventory.Add(&hiPotion, 4);
                Item powerPotion;
                powerPotion.SetName("Power potion");
@@ -266,10 +270,18 @@ int main(int argc, char **argv) {
                sleepBall.SetName("Sleep ball");
                sleepBall.SetMenuIcon(&ballIcon);
                sleepBall.SetUsableInBattle();
+               sleepBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ONE);
                inventory.Add(&sleepBall, 1);
+               Item multiBall;
+               multiBall.SetName("Multi-ball!");
+               multiBall.SetMenuIcon(&ballIcon);
+               multiBall.SetUsableInBattle();
+               multiBall.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_MULTIPLE);
+               inventory.Add(&multiBall, 1);
                Item figgoru;
                figgoru.SetName("Figgoru");
                figgoru.SetMenuIcon(&crankIcon);
+               figgoru.SetTargettingMode(Item::TARGETTING_MODE_ENEMY | Item::TARGETTING_MODE_ALL);
                inventory.Add(&figgoru, 1);
                battleRes.inventory = &inventory;