summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/char_select.cpp20
-rw-r--r--src/gui/char_select.h2
-rw-r--r--src/resources/image.cpp2
3 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 56df62ae..bd348c88 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -271,16 +271,16 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
mCreateButton = new Button("Create", "create", this);
mCancelButton = new Button("Cancel", "cancel", this);
mPlayerBox = new PlayerBox(mPlayer);
- mAttributeLable[0] = new gcn::Label("Strength:");
- mAttributeLable[1] = new gcn::Label("Agility:");
- mAttributeLable[2] = new gcn::Label("Dexterity:");
- mAttributeLable[3] = new gcn::Label("Vitality:");
- mAttributeLable[4] = new gcn::Label("Intelligence:");
- mAttributeLable[5] = new gcn::Label("Willpower:");
- mAttributeLable[6] = new gcn::Label("Charisma:");
+ mAttributeLabel[0] = new gcn::Label("Strength:");
+ mAttributeLabel[1] = new gcn::Label("Agility:");
+ mAttributeLabel[2] = new gcn::Label("Dexterity:");
+ mAttributeLabel[3] = new gcn::Label("Vitality:");
+ mAttributeLabel[4] = new gcn::Label("Intelligence:");
+ mAttributeLabel[5] = new gcn::Label("Willpower:");
+ mAttributeLabel[6] = new gcn::Label("Charisma:");
for (int i=0; i<7; i++)
{
- mAttributeLable[i]->setWidth(70);
+ mAttributeLabel[i]->setWidth(70);
mAttributeSlider[i] = new Slider(1, 20);
mAttributeValue[i] = new gcn::Label("1");
};
@@ -310,7 +310,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
mAttributeSlider[i]->setActionEventId("statslider");
mAttributeSlider[i]->addActionListener(this);
mAttributeValue[i]->setPosition(180, 140 + i*20);
- mAttributeLable[i]->setPosition(5, 140 + i*20);
+ mAttributeLabel[i]->setPosition(5, 140 + i*20);
};
mAttributesLeft->setPosition(15, 280);
UpdateSliders();
@@ -336,7 +336,7 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
{
add(mAttributeSlider[i]);
add(mAttributeValue[i]);
- add(mAttributeLable[i]);
+ add(mAttributeLabel[i]);
};
add(mAttributesLeft);
add(mCreateButton);
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 1b747607..5066897e 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -132,7 +132,7 @@ class CharCreateDialog : public Window, public gcn::ActionListener
gcn::Label *mHairStyleLabel;
gcn::Slider *mAttributeSlider[7];
- gcn::Label *mAttributeLable[7];
+ gcn::Label *mAttributeLabel[7];
gcn::Label *mAttributeValue[7];
gcn::Label *mAttributesLeft;
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 9398e06b..58325213 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -216,7 +216,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize,
GLenum error = glGetError();
if (error)
{
- std::string errmsg = "Unkown error";
+ std::string errmsg = "Unknown error";
switch (error)
{
case GL_INVALID_ENUM: