diff options
| author | David Athay <ko2fan@gmail.com> | 2008-08-05 12:06:40 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-08-05 12:06:40 +0000 |
| commit | d5bb76a134de27fd704cf2a76ad46df3026a8d0d (patch) | |
| tree | 5b17acb82c211790d0cebb82900b20bdf1fc8ff9 | |
| parent | d828b8c752fc285b26a4521c0718df5cfdc06f9d (diff) | |
| download | mana-d5bb76a134de27fd704cf2a76ad46df3026a8d0d.tar.gz mana-d5bb76a134de27fd704cf2a76ad46df3026a8d0d.tar.bz2 mana-d5bb76a134de27fd704cf2a76ad46df3026a8d0d.tar.xz mana-d5bb76a134de27fd704cf2a76ad46df3026a8d0d.zip | |
Fixed alignment (patch by Scraggy - Mantis #384) and spelling error.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 4 | ||||
| -rw-r--r-- | src/net/charserverhandler.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2008-08-05 David Athay <ko2fan@gmail.com> + + * src/gui/setup_video.cpp, src/net/charserverhandler.cpp: Fixed + alignment issue with fps limit field (patch by Scraggy #384. Also + fixed small spelling error. + 2008-08-04 Dennis Friis <peavey@placid.dk> * src/main.cpp: Fix typo in updatehost reported by Jaxad. diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 97e4cdd6..5044bbb6 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -192,7 +192,7 @@ Setup_Video::Setup_Video(): mScrollRadiusSlider->setDimension(gcn::Rectangle(10, 120, 75, 10)); gcn::Label *scrollRadiusLabel = new gcn::Label("Scroll radius"); scrollRadiusLabel->setPosition(90, 120); - mScrollRadiusField->setPosition(180, 120); + mScrollRadiusField->setPosition(mFpsField->getX(), 120); mScrollRadiusField->setWidth(30); mScrollRadiusField->setText(toString(mOriginalScrollRadius)); mScrollRadiusSlider->setValue(mOriginalScrollRadius); @@ -200,7 +200,7 @@ Setup_Video::Setup_Video(): mScrollLazinessSlider->setDimension(gcn::Rectangle(10, 140, 75, 10)); gcn::Label *scrollLazinessLabel = new gcn::Label("Scroll laziness"); scrollLazinessLabel->setPosition(90, 140); - mScrollLazinessField->setPosition(180, 140); + mScrollLazinessField->setPosition(mFpsField->getX(), 140); mScrollLazinessField->setWidth(30); mScrollLazinessField->setText(toString(mOriginalScrollLaziness)); mScrollLazinessSlider->setValue(mOriginalScrollLaziness); diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index 5cc53f7d..c49c7640 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -169,7 +169,7 @@ void CharServerHandler::handleMessage(MessageIn *msg) errorMessage = "Duplicated login"; break; default: - errorMessage = "Unkown error with 0x0081"; + errorMessage = "Unknown error with 0x0081"; break; } mCharInfo->unlock(); @@ -208,7 +208,7 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot) tempPlayer->mLevel = msg.readInt16(); msg.readInt16(); // skill point tempPlayer->setSprite(Being::BOTTOMCLOTHES_SPRITE, msg.readInt16()); // head bottom - tempPlayer->setSprite(Being::SHIELD_SPRITE, msg.readInt16()); + tempPlayer->setSprite(Being::SHIELD_SPRITE, msg.readInt16()); tempPlayer->setSprite(Being::HAT_SPRITE, msg.readInt16()); // head option top tempPlayer->setSprite(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid int hairColor = msg.readInt16(); |