summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-07-12 06:54:07 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-07-12 06:54:07 +0000
commitfaf43cf53247a8fa014bca4679a3dcba47371f80 (patch)
tree8a6bac3413d4ea7a95b07d1a81a65ec1dd097783 /src/gui
parentf170d959d5e4317b2289d0161c61353a94b2b717 (diff)
downloadmana-client-faf43cf53247a8fa014bca4679a3dcba47371f80.tar.gz
mana-client-faf43cf53247a8fa014bca4679a3dcba47371f80.tar.bz2
mana-client-faf43cf53247a8fa014bca4679a3dcba47371f80.tar.xz
mana-client-faf43cf53247a8fa014bca4679a3dcba47371f80.zip
Fixed a warning with GCC 4.2 about string comparisons.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/newskill.cpp37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/gui/newskill.cpp b/src/gui/newskill.cpp
index 809dd811..498186ba 100644
--- a/src/gui/newskill.cpp
+++ b/src/gui/newskill.cpp
@@ -38,34 +38,35 @@ const char *skill_name[] = {
// 0-99
// weapon skills 0-9
"Short Blades", "Long Blades", "Hammers", "Archery", "Whip",
- "Staves", "Throwing", "Piercing", "Hand to Hand", "",
+ "Staves", "Throwing", "Piercing", "Hand to Hand", NULL,
// magic skills 10-19
"Epyri (Fire)", "Merene (Water)", "Geon (Earth)", "Izurial (Air)",
"Lumine (Light)", "Tenebrae (Dark)", "Chronos (Time)", "Teless (Space)",
- "Gen (Mana)", "",
+ "Gen (Mana)", NULL,
// craft skills 20-29
"Metalworking", "Woodworking", "Jeweler", "Cook", "Tailor",
- "Alchemist", "Artisan", "Synthesis", "", "",
+ "Alchemist", "Artisan", "Synthesis", NULL, NULL,
// general skills 30-39
"Running", "Searching", "Sneak", "Trading", "Intimidate",
- "Athletics", "", "", "","",
+ "Athletics", NULL, NULL, NULL,NULL,
// combat skills 40-49
"Dodge", "Accuracy", "Critical", "Block", "Parry", "Diehard", "Magic Aura",
- "Counter", "", "",
+ "Counter", NULL, NULL,
// resistance skills 50-59
"Poison", "Silence", "Petrify", "Paralyze", "Blind", "Slow", "Zombie",
- "Critical", "", "",
+ "Critical", NULL, NULL,
// element reistance 60-69
- "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)",
- "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", "", "",
+ "Heat (Fire)", "Chill (Water)", "Stone (Earth)", "Wind (Air)",
+ "Shine (Light)", "Shadow (Dark)", "Decay (Time)", "Chaos (Space)", NULL,
+ NULL,
// hunting skills 70-79
"Insects", "Birds", "Lizards", "Amorphs", "Undead", "Machines", "Arcana",
- "Humanoids", "Plantoids", "",
+ "Humanoids", "Plantoids", NULL,
// stats 80-89
"Strength", "Fortitude", "Vitality", "Menality", "Awareness", "Mana",
- "Dexterity", "", "", "",
+ "Dexterity", NULL, NULL, NULL,
// unused (reserved) 90-99
- "", "", "", "", "", "", "", "", "", ""
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
@@ -73,7 +74,7 @@ NewSkillDialog::NewSkillDialog():
Window("Skills")
{
startPoint = 0;
- for ( int i = 0; i < N_SKILL_CAT_SIZE; i++)
+ for (int i = 0; i < N_SKILL_CAT_SIZE; i++)
{
mSkillLabel[i] = new gcn::Label("Empty ");
mSkillLevel[i] = new gcn::Label("00000");
@@ -84,7 +85,7 @@ NewSkillDialog::NewSkillDialog():
add(mSkillbar[i],180,5+i*25);
}
// initialize the skills
- for(int i=0;i<N_SKILL;i++)
+ for (int i = 0; i < N_SKILL; i++)
{
mPlayerSkill[i].level = 0;
mPlayerSkill[i].exp = 0;
@@ -163,7 +164,7 @@ void NewSkillDialog::action(const std::string& eventId)
{
startPoint =80;
}
- if(osp != startPoint)
+ if (osp != startPoint)
{
resetNSD();
}
@@ -171,14 +172,14 @@ void NewSkillDialog::action(const std::string& eventId)
void NewSkillDialog::resetNSD()
{
- for(int a=0;a<N_SKILL_CAT_SIZE;a++)
+ for (int a = 0; a < N_SKILL_CAT_SIZE; a++)
{
- if(skill_name[a+startPoint] != "")
+ if (skill_name[a + startPoint])
{
- mSkillLabel[a]->setCaption(skill_name[a+startPoint]);
+ mSkillLabel[a]->setCaption(skill_name[a + startPoint]);
mSkillLabel[a]->setVisible(true);
char tmp[5];
- sprintf(tmp, "%d",mPlayerSkill[a+startPoint].level);
+ sprintf(tmp, "%d", mPlayerSkill[a+startPoint].level);
mSkillLevel[a]->setCaption(tmp);
mSkillLevel[a]->setVisible(true);
mSkillbar[a]->setProgress(0.0f);