summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--The Mana World.dev43
-rw-r--r--src/gui/skill.cpp12
3 files changed, 53 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index ff3d301a..bba0ff46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-17 Eugenio Favalli <elvenprogrammer@gmail.com>
+
+ * The Mana World.dev, src/gui/skill.cpp: Updated to last changes, and
+ wrong names fixes.
+
2005-09-17 Yohann Ferreira <bertram@cegetel.net>
* src/game.cpp, src/gui/ministatus.cpp, src/gui/ministatus.h,
diff --git a/The Mana World.dev b/The Mana World.dev
index ef8b7765..75512155 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -1,7 +1,7 @@
[Project]
FileName=The Mana World.dev
Name=tmw
-UnitCount=167
+UnitCount=171
Type=0
Ver=1
ObjFiles=
@@ -1726,3 +1726,44 @@ Link=1
Priority=1000
OverrideBuildCmd=0
BuildCmd=
+
+[Unit168]
+FileName=src\gui\menuwindow.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit169]
+FileName=src\gui\menuwindow.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit170]
+FileName=src\gui\ministatus.cpp
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit171]
+FileName=src\gui\ministatus.h
+CompileCpp=1
+Folder=gui
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index a82b5c6a..5b065e47 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -166,8 +166,8 @@ std::string SkillDialog::getElementAt(int i)
char tmp[128];
sprintf(tmp, "%s Lv: %i Sp: %i",
skill_db[skillList[i]->id],
- skillList[i]->lvl,
- skillList[i]->mp);
+ skillList[i]->lv,
+ skillList[i]->sp);
return tmp;
}
return "";
@@ -188,8 +188,8 @@ void SkillDialog::addSkill(int id, int lvl, int mp)
printf("%i\n", id);
SKILL *tmp = new SKILL();
tmp->id = id;
- tmp->lvl = lvl;
- tmp->mp = mp;
+ tmp->lv = lvl;
+ tmp->sp = mp;
skillList.push_back(tmp);
}
@@ -197,8 +197,8 @@ void SkillDialog::setSkill(int id, int lvl, int mp)
{
for (unsigned int i = 0; i < skillList.size(); i++) {
if (skillList[i]->id == id) {
- skillList[i]->lvl = lvl;
- skillList[i]->mp = mp;
+ skillList[i]->lv = lvl;
+ skillList[i]->sp = mp;
}
}
}