summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/browserbox.cpp2
-rw-r--r--src/gui/char_select.cpp24
-rw-r--r--src/gui/chat.cpp34
-rw-r--r--src/gui/confirm_dialog.cpp2
-rw-r--r--src/gui/equipmentwindow.cpp2
-rw-r--r--src/gui/inventorywindow.cpp6
-rw-r--r--src/gui/itemcontainer.h2
-rw-r--r--src/gui/itempopup.cpp6
-rw-r--r--src/gui/itempopup.h6
-rw-r--r--src/gui/login.h47
-rw-r--r--src/gui/minimap.cpp4
-rw-r--r--src/gui/ministatus.cpp2
-rw-r--r--src/gui/ok_dialog.cpp2
-rw-r--r--src/gui/passwordfield.h2
-rw-r--r--src/gui/popupmenu.cpp198
-rw-r--r--src/gui/recorder.cpp7
-rw-r--r--src/gui/register.cpp24
-rw-r--r--src/gui/register.h36
-rw-r--r--src/gui/scrollarea.cpp12
-rw-r--r--src/gui/sdlinput.cpp2
-rw-r--r--src/gui/shortcutcontainer.cpp6
-rw-r--r--src/gui/speechbubble.h19
-rw-r--r--src/gui/trade.cpp4
-rw-r--r--src/gui/viewport.cpp9
-rw-r--r--src/gui/window.cpp32
-rw-r--r--src/gui/window.h2
26 files changed, 246 insertions, 246 deletions
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 5895d557..65659df6 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -103,7 +103,7 @@ void BrowserBox::addRow(const std::string &row)
newRow += "##<" + bLink.caption;
tmp.erase(0, idx3 + 2);
- if(tmp != "")
+ if (tmp != "")
{
newRow += "##>";
}
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 6626b848..8de4f5a7 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -94,8 +94,8 @@ CharSelectDialog::CharSelectDialog(Network *network,
mJobLevelLabel = new gcn::Label(strprintf(_("Job Level: %d"), 0));
mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
- const std::string tempString = getFont()->getWidth(_("New")) <
- getFont()->getWidth(_("Delete")) ?
+ const std::string tempString = getFont()->getWidth(_("New")) <
+ getFont()->getWidth(_("Delete")) ?
_("Delete") : _("New");
mPreviousButton = new Button(_("Previous"), "previous", this);
@@ -231,7 +231,7 @@ bool CharSelectDialog::selectByName(const std::string &name)
unsigned int oldPos = mCharInfo->getPos();
mCharInfo->select(0);
- do
+ do
{
LocalPlayer *player = mCharInfo->getEntry();
@@ -309,15 +309,15 @@ CharCreateDialog::~CharCreateDialog()
void CharCreateDialog::action(const gcn::ActionEvent &event)
{
int numberOfColors = ColorDB::size();
- if (event.getId() == "create")
+ if (event.getId() == "create")
{
- if (getName().length() >= 4)
+ if (getName().length() >= 4)
{
// Attempt to create the character
mCreateButton->setEnabled(false);
attemptCharCreate();
}
- else
+ else
{
new OkDialog("Error",
"Your name needs to be at least 4 characters.", this);
@@ -326,18 +326,18 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
else if (event.getId() == "cancel")
scheduleDelete();
else if (event.getId() == "nextcolor")
- mPlayer->setHairStyle(mPlayer->getHairStyle(),
+ mPlayer->setHairStyle(mPlayer->getHairStyle(),
(mPlayer->getHairColor() + 1) % numberOfColors);
else if (event.getId() == "prevcolor")
- mPlayer->setHairStyle(mPlayer->getHairStyle(),
- (mPlayer->getHairColor() + numberOfColors - 1) %
+ mPlayer->setHairStyle(mPlayer->getHairStyle(),
+ (mPlayer->getHairColor() + numberOfColors - 1) %
numberOfColors);
else if (event.getId() == "nextstyle")
- mPlayer->setHairStyle(mPlayer->getHairStyle() + 1,
+ mPlayer->setHairStyle(mPlayer->getHairStyle() + 1,
mPlayer->getHairColor());
else if (event.getId() == "prevstyle")
- mPlayer->setHairStyle(mPlayer->getHairStyle() +
- mPlayer->getNumOfHairstyles() - 1,
+ mPlayer->setHairStyle(mPlayer->getHairStyle() +
+ mPlayer->getNumOfHairstyles() - 1,
mPlayer->getHairColor());
}
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 2363fc50..92dd46d7 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -138,7 +138,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
}
std::string lineColor = "##C";
- switch (own)
+ switch (own)
{
case BY_GM:
if (tmp.nick.empty())
@@ -215,7 +215,7 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
// adding a row, otherwise the max will always be a row higher
// at comparison.
if (mScrollArea->getVerticalScrollAmount() ==
- mScrollArea->getVerticalMaxScroll())
+ mScrollArea->getVerticalMaxScroll())
{
mTextOutput->addRow(line);
mScrollArea->setVerticalScrollAmount(mScrollArea->
@@ -341,7 +341,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
return;
// Send party message
- if (msg.at(0) == mPartyPrefix)
+ if (msg.at(0) == mPartyPrefix)
{
msg.erase(0, 1);
std::size_t length = msg.length() + 1;
@@ -367,7 +367,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
if (end != std::string::npos)
{
// Catch multiple embeds and ignore them so it doesn't crash the client.
- while ((msg.find('[', start + 1) != std::string::npos) &&
+ while ((msg.find('[', start + 1) != std::string::npos) &&
(msg.find('[', start + 1) < end))
{
start = msg.find('[', start + 1);
@@ -395,7 +395,7 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
}
// Prepare ordinary message
- if (msg.substr(0, 1) != "/")
+ if (msg.substr(0, 1) != "/")
{
msg = nick + " : " + msg;
@@ -423,14 +423,14 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
trim(msg);
}
- if (command == "announce")
+ if (command == "announce")
{
MessageOut outMsg(mNetwork);
outMsg.writeInt16(0x0099);
outMsg.writeInt16(msg.length() + 4);
outMsg.writeString(msg, msg.length());
}
- else if (command == "help")
+ else if (command == "help")
{
trim(msg);
std::size_t space = msg.find(" ");
@@ -483,16 +483,16 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
msg = msg.substr(0, 1);
- if (msg == "1" ||
- msg == "y" || msg == "Y" ||
+ if (msg == "1" ||
+ msg == "y" || msg == "Y" ||
msg == "t" || msg == "T")
{
chatLog(_("Return now toggles chat."), BY_SERVER);
mReturnToggles = true;
return;
}
- else if (msg == "0" ||
- msg == "n" || msg == "N" ||
+ else if (msg == "0" ||
+ msg == "n" || msg == "N" ||
msg == "f" || msg == "F")
{
chatLog(_("Message now closes chat."), BY_SERVER);
@@ -787,7 +787,7 @@ void ChatWindow::party(const std::string & command, const std::string & rest)
void ChatWindow::help(const std::string & msg1, const std::string & msg2)
{
chatLog(_("-- Help --"), BY_SERVER);
- if (msg1 == "")
+ if (msg1 == "")
{
chatLog(_("/announce: Global announcement (GM only)"), BY_SERVER);
chatLog(_("/clear: Clears this window"), BY_SERVER);
@@ -827,18 +827,18 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
chatLog(_("Command: /help <command>"), BY_SERVER);
chatLog(_("This command displays help on <command>."), BY_SERVER);
}
- else if (msg1 == "party")
+ else if (msg1 == "party")
{
mParty->help(msg2);
}
- else if (msg1 == "present")
+ else if (msg1 == "present")
{
chatLog(_("Command: /present"), BY_SERVER);
chatLog(_("This command gets a list of players within hearing and "
"sends it to either the record log if recording, or the chat "
"log otherwise."), BY_SERVER);
}
- else if (msg1 == "record")
+ else if (msg1 == "record")
{
chatLog(_("Command: /record <filename>"), BY_SERVER);
chatLog(_("This command starts recording the chat log to the file "
@@ -846,10 +846,10 @@ void ChatWindow::help(const std::string & msg1, const std::string & msg2)
chatLog(_("Command: /record"), BY_SERVER);
chatLog(_("This command finishes a recording session."), BY_SERVER);
}
- else if (msg1 == "toggle")
+ else if (msg1 == "toggle")
{
chatLog(_("Command: /toggle <state>"), BY_SERVER);
- chatLog(_("This command sets whether the return key should toggle the"
+ chatLog(_("This command sets whether the return key should toggle the"
"chat log, or whether the chat log turns off automatically."),
BY_SERVER);
chatLog(_("<state> can be one of \"1\", \"yes\", \"true\" to "
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 8bb9c578..38697f3a 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -55,7 +55,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
// 15 == height of each line of text (based on font heights)
// 14 == row top + bottom graphic pixel heights
setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + noButton->getHeight());
- mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
+ mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
3 + (numRows * 14)));
}
else
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index e553fbe7..a2be6b00 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -125,7 +125,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
graphics->drawText(toString(item->getQuantity()),
mEquipBox[i].posX + (BOX_WIDTH / 2),
mEquipBox[i].posY - getFont()->getHeight(),
- gcn::Graphics::CENTER);
+ gcn::Graphics::CENTER);
}
}
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 70b3efb5..b9fe1c90 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -57,11 +57,11 @@ InventoryWindow::InventoryWindow(int invSize):
// If you adjust these defaults, don't forget to adjust the trade window's.
setDefaultSize(115, 25, 375, 300);
- std::string longestUseString = getFont()->getWidth(_("Equip")) >
+ std::string longestUseString = getFont()->getWidth(_("Equip")) >
getFont()->getWidth(_("Use")) ?
_("Equip") : _("Use");
- if (getFont()->getWidth(longestUseString) <
+ if (getFont()->getWidth(longestUseString) <
getFont()->getWidth(_("Unequip")))
{
longestUseString = _("Unequip");
@@ -150,7 +150,7 @@ void InventoryWindow::logic()
// Adjust progress bars
mSlotsBar->setProgress((float)
player_node->getInventory()->getNumberOfSlotsUsed() / mMaxSlots);
- mWeightBar->setProgress((float) player_node->mTotalWeight /
+ mWeightBar->setProgress((float) player_node->mTotalWeight /
player_node->mMaxWeight);
mSlotsBar->setText(strprintf("%s/%d", mUsedSlots.c_str(), mMaxSlots));
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index f027de19..23b9e5e1 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -42,7 +42,7 @@ namespace gcn {
*
* \ingroup GUI
*/
-class ItemContainer : public gcn::Widget,
+class ItemContainer : public gcn::Widget,
public gcn::MouseListener,
public gcn::WidgetListener
{
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index b7e015a4..ddce449a 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -136,12 +136,12 @@ void ItemPopup::setItem(const ItemInfo &item)
mItemWeightScroll->setDimension(gcn::Rectangle(2, 0, minWidth,
numRowsWeight * getFont()->getHeight()));
- if(item.getEffect() == "")
+ if (item.getEffect() == "")
{
setContentSize(minWidth, (numRowsDesc * getFont()->getHeight() +
(3 * getFont()->getHeight())));
- mItemWeightScroll->setPosition(2,
+ mItemWeightScroll->setPosition(2,
(numRowsDesc * getFont()->getHeight()) +
(2 * getFont()->getHeight()));
}
@@ -151,7 +151,7 @@ void ItemPopup::setItem(const ItemInfo &item)
(numRowsEffect * getFont()->getHeight()) +
(3 * getFont()->getHeight()));
- mItemWeightScroll->setPosition(2,
+ mItemWeightScroll->setPosition(2,
(numRowsDesc * getFont()->getHeight()) +
(numRowsEffect * getFont()->getHeight()) +
(2 * getFont()->getHeight()));
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 95ab6ffa..1d37346e 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef ITEMPOPUP_H__
-#define ITEMPOPUP_H__
+#ifndef ITEMPOPUP_H
+#define ITEMPOPUP_H
#include "window.h"
@@ -51,4 +51,4 @@ class ItemPopup : public Window
gcn::Color getColor(const std::string& type);
};
-#endif // ITEMPOPUP_H__
+#endif // ITEMPOPUP_H
diff --git a/src/gui/login.h b/src/gui/login.h
index 023d60aa..c0d6e755 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -73,29 +73,29 @@ class LoginDialog : public Window, public gcn::ActionListener,
*/
bool canSubmit();
- /**
- * Function to decide whether string is an unsigned short or not
- *
- * @param str the string to parse
- *
- * @return true is str is an unsigned short, false otherwise
- */
- static bool isUShort(const std::string &str);
-
- /**
- * Converts string to an unsigned short (undefined if invalid)
- *
- * @param str the string to parse
- *
- * @return the value str represents
- */
- static unsigned short getUShort(const std::string &str);
+ /**
+ * Function to decide whether string is an unsigned short or not
+ *
+ * @param str the string to parse
+ *
+ * @return true is str is an unsigned short, false otherwise
+ */
+ static bool isUShort(const std::string &str);
+
+ /**
+ * Converts string to an unsigned short (undefined if invalid)
+ *
+ * @param str the string to parse
+ *
+ * @return the value str represents
+ */
+ static unsigned short getUShort(const std::string &str);
DropDown *mServerDropDown;
gcn::TextField *mUserField;
gcn::TextField *mPassField;
gcn::TextField *mServerField;
- gcn::TextField *mPortField;
+ gcn::TextField *mPortField;
gcn::CheckBox *mKeepCheck;
gcn::Button *mOkButton;
gcn::Button *mCancelButton;
@@ -111,26 +111,25 @@ class LoginDialog : public Window, public gcn::ActionListener,
{
private:
std::vector<std::string> mServers;
- std::vector<std::string> mPorts;
+ std::vector<std::string> mPorts;
std::string mConfigPrefix;
int mMaxEntries;
void saveEntry(const std::string &server,
- const std::string &port, int &saved);
+ const std::string &port, int &saved);
public:
DropDownList(std::string prefix,
std::vector<std::string> dfltServer,
- std::vector<std::string> dfltPort,
+ std::vector<std::string> dfltPort,
int maxEntries);
void save(const std::string &server, const std::string &port);
int getNumberOfElements();
std::string getElementAt(int i);
- std::string getServerAt(int i);
- std::string getPortAt(int i);
+ std::string getServerAt(int i);
+ std::string getPortAt(int i);
};
DropDownList *mServerList;
gcn::ListBox *mServerListBox;
gcn::ScrollArea *mServerScrollArea;
-
};
#endif
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 37505305..55cd8b5d 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -68,9 +68,9 @@ void Minimap::setMapImage(Image *img)
const int offsetX = 2 * getPadding();
const int offsetY = getTitleBarHeight() + getPadding();
const int titleWidth = getFont()->getWidth(getCaption()) + 15;
- const int mapWidth = mMapImage->getWidth() < 100 ?
+ const int mapWidth = mMapImage->getWidth() < 100 ?
mMapImage->getWidth() + offsetX : 100;
- const int mapHeight = mMapImage->getHeight() < 100 ?
+ const int mapHeight = mMapImage->getHeight() < 100 ?
mMapImage->getHeight() + offsetY : 100;
setMinWidth(mapWidth > titleWidth ? mapWidth : titleWidth);
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 4c22e63d..13351915 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -91,7 +91,7 @@ void MiniStatusWindow::update()
// Displays the number of monsters to next lvl
// (disabled for now but interesting idea)
/*
- if(config.getValue("xpBarMonsterCounterExp", 0)!=0)
+ if (config.getValue("xpBarMonsterCounterExp", 0)!=0)
{
updatedText << " | "
<< (int)(((float)player_node->mXpForNextLevel - (float)player_node->mXp)
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 0d1f658f..2c67e71f 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -52,7 +52,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
// 15 == height of each line of text (based on font heights)
// 14 == row top + bottom graphic pixel heights
setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + okButton->getHeight());
- mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
+ mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
3 + (numRows * 14)));
}
else
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 89293b05..42f8d187 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -31,7 +31,7 @@
*
* \ingroup GUI
*/
-class PasswordField : public TextField
+class PasswordField : public TextField
{
public:
/**
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 6c0e6ad6..53c24960 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -70,52 +70,52 @@ void PopupMenu::showPopup(int x, int y, Being *being)
switch (mBeing->getType())
{
- case Being::PLAYER:
- {
- // Players can be traded with. Later also attack, follow and
- // add as buddy will be options in this menu.
- const std::string &name = mBeing->getName();
- mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
- mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
-
- mBrowserBox->addRow("##3---");
-
- switch (player_relations.getRelation(name)) {
- case PlayerRelation::NEUTRAL:
- mBrowserBox->addRow(strprintf(_("@@friend|Befriend %s@@"), name.c_str()));
-
- case PlayerRelation::FRIEND:
- mBrowserBox->addRow(strprintf(_("@@disregard|Disregard %s@@"), name.c_str()));
- mBrowserBox->addRow(strprintf(_("@@ignore|Ignore %s@@"), name.c_str()));
- break;
-
- case PlayerRelation::DISREGARDED:
- mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
- mBrowserBox->addRow(strprintf(_("@@ignore|Completely ignore %s@@"), name.c_str()));
- break;
-
- case PlayerRelation::IGNORED:
- mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
- break;
- }
-
- //mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
- //mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
-
- mBrowserBox->addRow("##3---");
- mBrowserBox->addRow(strprintf(_("@@party-invite|Invite %s to party@@"), name.c_str()));
- }
- break;
-
- case Being::NPC:
- // NPCs can be talked to (single option, candidate for removal
- // unless more options would be added)
- mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
- break;
-
- default:
- /* Other beings aren't interesting... */
- break;
+ case Being::PLAYER:
+ {
+ // Players can be traded with. Later also attack, follow and
+ // add as buddy will be options in this menu.
+ const std::string &name = mBeing->getName();
+ mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
+ mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
+
+ mBrowserBox->addRow("##3---");
+
+ switch (player_relations.getRelation(name)) {
+ case PlayerRelation::NEUTRAL:
+ mBrowserBox->addRow(strprintf(_("@@friend|Befriend %s@@"), name.c_str()));
+
+ case PlayerRelation::FRIEND:
+ mBrowserBox->addRow(strprintf(_("@@disregard|Disregard %s@@"), name.c_str()));
+ mBrowserBox->addRow(strprintf(_("@@ignore|Ignore %s@@"), name.c_str()));
+ break;
+
+ case PlayerRelation::DISREGARDED:
+ mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
+ mBrowserBox->addRow(strprintf(_("@@ignore|Completely ignore %s@@"), name.c_str()));
+ break;
+
+ case PlayerRelation::IGNORED:
+ mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
+ break;
+ }
+
+ //mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
+ //mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
+
+ mBrowserBox->addRow("##3---");
+ mBrowserBox->addRow(strprintf(_("@@party-invite|Invite %s to party@@"), name.c_str()));
+ }
+ break;
+
+ case Being::NPC:
+ // NPCs can be talked to (single option, candidate for removal
+ // unless more options would be added)
+ mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
+ break;
+
+ default:
+ /* Other beings aren't interesting... */
+ break;
}
//browserBox->addRow("@@look|Look To@@");
@@ -145,56 +145,56 @@ void PopupMenu::handleLink(const std::string& link)
{
// Talk To action
if (link == "talk" &&
- mBeing != NULL &&
- mBeing->getType() == Being::NPC &&
- current_npc == 0)
+ mBeing != NULL &&
+ mBeing->getType() == Being::NPC &&
+ current_npc == 0)
{
- dynamic_cast<NPC*>(mBeing)->talk();
+ dynamic_cast<NPC*>(mBeing)->talk();
}
// Trade action
else if (link == "trade" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- player_node->trade(mBeing);
- tradePartnerName = mBeing->getName();
+ player_node->trade(mBeing);
+ tradePartnerName = mBeing->getName();
}
// Attack action
else if (link == "attack" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- player_node->attack(mBeing, true);
+ player_node->attack(mBeing, true);
}
else if (link == "unignore" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- player_relations.setRelation(mBeing->getName(), PlayerRelation::NEUTRAL);
+ player_relations.setRelation(mBeing->getName(), PlayerRelation::NEUTRAL);
}
else if (link == "ignore" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- player_relations.setRelation(mBeing->getName(), PlayerRelation::IGNORED);
+ player_relations.setRelation(mBeing->getName(), PlayerRelation::IGNORED);
}
else if (link == "disregard" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- player_relations.setRelation(mBeing->getName(), PlayerRelation::DISREGARDED);
+ player_relations.setRelation(mBeing->getName(), PlayerRelation::DISREGARDED);
}
else if (link == "friend" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- player_relations.setRelation(mBeing->getName(), PlayerRelation::FRIEND);
+ player_relations.setRelation(mBeing->getName(), PlayerRelation::FRIEND);
}
/*
@@ -207,16 +207,16 @@ void PopupMenu::handleLink(const std::string& link)
// Add Buddy action
else if ((link == "buddy") && mBeing != NULL && mBeing->isPlayer())
{
- if (!buddyWindow->isVisible())
- buddyWindow->setVisible(true);
+ if (!buddyWindow->isVisible())
+ buddyWindow->setVisible(true);
- buddyWindow->addBuddy(mBeing->getName());
+ buddyWindow->addBuddy(mBeing->getName());
}*/
// Pick Up Floor Item action
else if ((link == "pickup") && mFloorItem != NULL)
{
- player_node->pickUp(mFloorItem);
+ player_node->pickUp(mFloorItem);
}
// Look To action
@@ -226,46 +226,46 @@ void PopupMenu::handleLink(const std::string& link)
else if (link == "use")
{
- assert(mItem);
- if (mItem->isEquipment())
- {
- if (mItem->isEquipped())
- {
- player_node->unequipItem(mItem);
- }
- else
- {
- player_node->equipItem(mItem);
- }
- }
- else
- {
- player_node->useItem(mItem);
- }
+ assert(mItem);
+ if (mItem->isEquipment())
+ {
+ if (mItem->isEquipped())
+ {
+ player_node->unequipItem(mItem);
+ }
+ else
+ {
+ player_node->equipItem(mItem);
+ }
+ }
+ else
+ {
+ player_node->useItem(mItem);
+ }
}
else if (link == "chat")
{
- chatWindow->addItemText(mItem->getInfo().getName());
+ chatWindow->addItemText(mItem->getInfo().getName());
}
else if (link == "drop")
{
- new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
+ new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
}
else if (link == "party-invite" &&
- mBeing != NULL &&
- mBeing->getType() == Being::PLAYER)
+ mBeing != NULL &&
+ mBeing->getType() == Being::PLAYER)
{
- MessageOut outMsg(player_node->getNetwork());
- outMsg.writeInt16(CMSG_PARTY_INVITE);
- outMsg.writeInt32(mBeing->getId());
+ MessageOut outMsg(player_node->getNetwork());
+ outMsg.writeInt16(CMSG_PARTY_INVITE);
+ outMsg.writeInt32(mBeing->getId());
}
// Unknown actions
else
{
- std::cout << link << std::endl;
+ std::cout << link << std::endl;
}
setVisible(false);
@@ -303,9 +303,9 @@ void PopupMenu::showPopup(int x, int y)
{
setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8);
if (windowContainer->getWidth() < (x + getWidth() + 5))
- x = windowContainer->getWidth() - getWidth();
+ x = windowContainer->getWidth() - getWidth();
if (windowContainer->getHeight() < (y + getHeight() + 5))
- y = windowContainer->getHeight() - getHeight();
+ y = windowContainer->getHeight() - getHeight();
setPosition(x, y);
setVisible(true);
requestMoveToTop();
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 1e7d8e13..2e2ee8a5 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -52,6 +52,10 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title,
loadWindowState();
}
+Recorder::~Recorder()
+{
+}
+
void Recorder::record(const std::string &msg)
{
if (mStream.is_open())
@@ -110,6 +114,3 @@ void Recorder::action(const gcn::ActionEvent &event)
changeRecordingStatus("");
}
-Recorder::~Recorder()
-{
-}
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index cbf87e5b..cf12375c 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -251,21 +251,21 @@ bool RegisterDialog::isUShort(const std::string &str)
{
if (str == "")
{
- return false;
+ return false;
}
unsigned long l = 0;
for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
- strPtr != strEnd; ++strPtr)
+ strPtr != strEnd; ++strPtr)
{
- if (*strPtr < '0' || *strPtr > '9')
+ if (*strPtr < '0' || *strPtr > '9')
{
- return false;
- }
- l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
- if (l > 65535)
- {
- return false;
- }
+ return false;
+ }
+ l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
+ if (l > 65535)
+ {
+ return false;
+ }
}
return true;
}
@@ -274,9 +274,9 @@ unsigned short RegisterDialog::getUShort(const std::string &str)
{
unsigned long l = 0;
for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
- strPtr != strEnd; ++strPtr)
+ strPtr != strEnd; ++strPtr)
{
- l = l * 10 + (*strPtr - '0');
+ l = l * 10 + (*strPtr - '0');
}
return static_cast<unsigned short>(l);
}
diff --git a/src/gui/register.h b/src/gui/register.h
index e58ac9db..9588e07e 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -72,29 +72,29 @@ class RegisterDialog : public Window, public gcn::ActionListener,
*/
bool canSubmit() const;
- /**
- * Function to decide whether string is an unsigned short or not
- *
- * @param str the string to parse
- *
- * @return true if str is an unsigned short, false otherwise
- */
- static bool isUShort(const std::string &str);
-
- /**
- * Converts string to an unsigned short (undefined if invalid)
- *
- * @param str the string to parse
- *
- * @return the value str represents
- */
- static unsigned short getUShort(const std::string &str);
+ /**
+ * Function to decide whether string is an unsigned short or not
+ *
+ * @param str the string to parse
+ *
+ * @return true if str is an unsigned short, false otherwise
+ */
+ static bool isUShort(const std::string &str);
+
+ /**
+ * Converts string to an unsigned short (undefined if invalid)
+ *
+ * @param str the string to parse
+ *
+ * @return the value str represents
+ */
+ static unsigned short getUShort(const std::string &str);
gcn::TextField *mUserField;
gcn::TextField *mPasswordField;
gcn::TextField *mConfirmField;
gcn::TextField *mServerField;
- gcn::TextField *mPortField;
+ gcn::TextField *mPortField;
gcn::Button *mRegisterButton;
gcn::Button *mCancelButton;
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index 09f7c5e7..eacc4714 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -110,9 +110,9 @@ void ScrollArea::init()
int vsgridy[4] = {0, 4, 15, 19};
a = 0;
- for (y = 0; y < 3; y++)
+ for (y = 0; y < 3; y++)
{
- for (x = 0; x < 3; x++)
+ for (x = 0; x < 3; x++)
{
vMarker.grid[a] = vscroll->getSubImage(
vsgridx[x], vsgridy[y],
@@ -214,7 +214,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
int w = getWidth() + bs * 2;
int h = getHeight() + bs * 2;
- if (mOpaque)
+ if (mOpaque)
{
static_cast<Graphics*>(graphics)->
drawImageRect(0, 0, w, h, background);
@@ -225,11 +225,11 @@ void ScrollArea::setOpaque(bool opaque)
{
mOpaque = opaque;
- if (mOpaque)
+ if (mOpaque)
{
setFrameSize(2);
}
- else
+ else
{
setFrameSize(0);
}
@@ -240,7 +240,7 @@ void ScrollArea::drawButton(gcn::Graphics *graphics, BUTTON_DIR dir)
int state = 0;
gcn::Rectangle dim;
- switch(dir)
+ switch (dir)
{
case UP:
state = mUpButtonPressed ? 1 : 0;
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index f68dc9c8..51442798 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -228,7 +228,7 @@ int SDLInput::convertMouseButton(int button)
int SDLInput::convertKeyCharacter(SDL_Event event)
{
SDL_keysym keysym = event.key.keysym;
-
+
int value = keysym.unicode;
switch (keysym.sym)
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index eae24785..4472818e 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -38,7 +38,7 @@ ShortcutContainer::ShortcutContainer():
void ShortcutContainer::widgetResized(const gcn::Event &event)
{
mGridWidth = getWidth() / mBoxWidth;
- if (mGridWidth < 1)
+ if (mGridWidth < 1)
{
mGridWidth = 1;
}
@@ -47,7 +47,7 @@ void ShortcutContainer::widgetResized(const gcn::Event &event)
(mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight);
mGridHeight = getHeight() / mBoxHeight;
- if (mGridHeight < 1)
+ if (mGridHeight < 1)
{
mGridHeight = 1;
}
@@ -57,7 +57,7 @@ int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const
{
const gcn::Rectangle tRect = gcn::Rectangle(
0, 0, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
- if (!tRect.isPointInRect(pointX, pointY))
+ if (!tRect.isPointInRect(pointX, pointY))
{
return -1;
}
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 7f5818af..43267a4e 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef SPEECHBUBBLE_H__
-#define SPEECHBUBBLE_H__
+#ifndef SPEECHBUBBLE_H
+#define SPEECHBUBBLE_H
#include "window.h"
@@ -31,20 +31,19 @@ class TextBox;
class SpeechBubble : public Window
{
public:
-
- SpeechBubble();
- ~SpeechBubble();
+ SpeechBubble();
+ ~SpeechBubble();
void setCaption(const std::string &name,
const gcn::Color &color = 0x000000);
- void setText(std::string mText);
- void setLocation(int x, int y);
- unsigned int getNumRows();
+ void setText(std::string mText);
+ void setLocation(int x, int y);
+ unsigned int getNumRows();
private:
gcn::Label *mCaption;
- TextBox *mSpeechBox;
- ScrollArea *mSpeechArea;
+ TextBox *mSpeechBox;
+ ScrollArea *mSpeechArea;
};
#endif
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index f901be5e..af30d1fe 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -125,7 +125,7 @@ void TradeWindow::addMoney(int amount)
void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
{
- if (own)
+ if (own)
{
mMyItemContainer->setWidth(mMyScroll->getWidth());
mMyInventory->addItem(id, quantity, equipment);
@@ -139,7 +139,7 @@ void TradeWindow::addItem(int id, bool own, int quantity, bool equipment)
void TradeWindow::removeItem(int id, bool own)
{
- if (own)
+ if (own)
mMyInventory->removeItem(id);
else
mPartnerInventory->removeItem(id);
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 19e9a4fb..6b6c982a 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -167,7 +167,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
// Find a path from the player to the mouse, and draw it. This is for debug
// purposes.
- if (mShowDebugPath)
+ if (mShowDebugPath)
{
// Get the current mouse position
int mouseX, mouseY;
@@ -263,7 +263,8 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
mPopupMenu->showPopup(event.getX(), event.getY(), being);
return;
}
- else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
+ else if ((floorItem = floorItemManager->findByCoordinates(tilex,
+ tiley)))
{
mPopupMenu->showPopup(event.getX(), event.getY(), floorItem);
return;
@@ -282,7 +283,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
{
Being *being;
FloorItem *item;
-
+
// Interact with some being
// if ((being = beingManager->findBeing(tilex, tiley)))
if ((being = beingManager->findBeingByPixel(x, y)))
@@ -330,7 +331,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
{
// Find the being nearest to the clicked position
Being *target = beingManager->findBeingByPixel(x, y);
-
+
if (target)
{
player_node->setTarget(target);
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 934bd9b3..8000179d 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -75,7 +75,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent, const std
{
logger->log("Window::Window(\"%s\")", caption.c_str());
- if (!windowContainer)
+ if (!windowContainer)
{
throw GCN_EXCEPTION("Window::Window(): no windowContainer set");
}
@@ -126,7 +126,7 @@ Window::~Window()
config.setValue(name + "WinY", getY());
config.setValue(name + "Visible", isVisible());
- if (mGrip)
+ if (mGrip)
{
config.setValue(name + "WinWidth", getWidth());
config.setValue(name + "WinHeight", getHeight());
@@ -145,7 +145,7 @@ Window::~Window()
instances--;
// Clean up static resources
- for( int i = 0; i < 9; i++ )
+ for (int i = 0; i < 9; i++)
{
delete border.grid[i];
border.grid[i] = NULL;
@@ -525,7 +525,7 @@ int Window::getResizeHandles(gcn::MouseEvent &event)
void Window::setGuiAlpha()
{
//logger->log("Window::setGuiAlpha: Alpha Value %f", config.getValue("guialpha", 0.8));
- for(int i = 0; i < 9; i++)
+ for (int i = 0; i < 9; i++)
{
//logger->log("Window::setGuiAlpha: Border Image (%i)", i);
border.grid[i]->setAlpha(config.getValue("guialpha", 0.8));
@@ -534,7 +534,7 @@ void Window::setGuiAlpha()
mAlphaChanged = false;
}
-void Window::loadSkin(const std::string filename)
+void Window::loadSkin(const std::string &filename)
{
const std::string windowId = Window::getId();
@@ -544,7 +544,7 @@ void Window::loadSkin(const std::string filename)
logger->log("Loading Window ID '%s'.", windowId.c_str());
- if(filename == "")
+ if (filename.empty())
logger->error("Window::loadSkin(): Invalid File Name.");
// TODO:
@@ -562,7 +562,7 @@ void Window::loadSkin(const std::string filename)
std::string skinSetImage;
skinSetImage = XML::getProperty(rootNode, "image", "");
Image *dBorders = NULL;
- if(skinSetImage != "")
+ if (!skinSetImage.empty())
{
logger->log("Window::loadSkin(): <skinset> defines '%s' as a skin image.", skinSetImage.c_str());
dBorders = resman->getImage("graphics/gui/" + skinSetImage);//"graphics/gui/speech_bubble.png");
@@ -596,7 +596,7 @@ void Window::loadSkin(const std::string filename)
std::string partType;
partType = XML::getProperty(partNode, "type", "unknown");
// TOP ROW
- if(partType == "top-left-corner")
+ if (partType == "top-left-corner")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -605,7 +605,7 @@ void Window::loadSkin(const std::string filename)
border.grid[0] = dBorders->getSubImage(xPos, yPos, width, height);
}
- else if(partType == "top-edge")
+ else if (partType == "top-edge")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -614,7 +614,7 @@ void Window::loadSkin(const std::string filename)
border.grid[1] = dBorders->getSubImage(xPos, yPos, width, height);
}
- else if(partType == "top-right-corner")
+ else if (partType == "top-right-corner")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -625,7 +625,7 @@ void Window::loadSkin(const std::string filename)
}
// MIDDLE ROW
- else if(partType == "left-edge")
+ else if (partType == "left-edge")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -634,7 +634,7 @@ void Window::loadSkin(const std::string filename)
border.grid[3] = dBorders->getSubImage(xPos, yPos, width, height);
}
- else if(partType == "bg-quad")
+ else if (partType == "bg-quad")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -643,7 +643,7 @@ void Window::loadSkin(const std::string filename)
border.grid[4] = dBorders->getSubImage(xPos, yPos, width, height);
}
- else if(partType == "right-edge")
+ else if (partType == "right-edge")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -654,7 +654,7 @@ void Window::loadSkin(const std::string filename)
}
// BOTTOM ROW
- else if(partType == "bottom-left-corner")
+ else if (partType == "bottom-left-corner")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -663,7 +663,7 @@ void Window::loadSkin(const std::string filename)
border.grid[6] = dBorders->getSubImage(xPos, yPos, width, height);
}
- else if(partType == "bottom-edge")
+ else if (partType == "bottom-edge")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
@@ -672,7 +672,7 @@ void Window::loadSkin(const std::string filename)
border.grid[7] = dBorders->getSubImage(xPos, yPos, width, height);
}
- else if(partType == "bottom-right-corner")
+ else if (partType == "bottom-right-corner")
{
const int xPos = XML::getProperty(partNode, "xpos", 0);
const int yPos = XML::getProperty(partNode, "ypos", 0);
diff --git a/src/gui/window.h b/src/gui/window.h
index 501ad160..25bf903a 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -264,7 +264,7 @@ class Window : public gcn::Window, gcn::WidgetListener
/**
* Loads a window skin
*/
- void loadSkin(const std::string filename);
+ void loadSkin(const std::string &filename);
/**
* Adds a widget to the window and sets it at given cell.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-29 19:06:36 +0000