summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/inventorywindow.cpp43
-rw-r--r--src/gui/inventorywindow.h8
-rw-r--r--src/gui/itemamountwindow.cpp32
-rw-r--r--src/gui/itemamountwindow.h11
-rw-r--r--src/gui/itempopup.cpp27
-rw-r--r--src/gui/itempopup.h8
-rw-r--r--src/gui/killstats.cpp27
-rw-r--r--src/gui/killstats.h5
-rw-r--r--src/gui/logindialog.cpp14
-rw-r--r--src/gui/logindialog.h4
-rw-r--r--src/gui/minimap.cpp19
-rw-r--r--src/gui/minimap.h2
-rw-r--r--src/gui/ministatuswindow.cpp43
-rw-r--r--src/gui/ministatuswindow.h16
-rw-r--r--src/gui/npcdialog.cpp40
-rw-r--r--src/gui/npcdialog.h16
-rw-r--r--src/gui/okdialog.cpp6
-rw-r--r--src/gui/okdialog.h4
-rw-r--r--src/gui/outfitwindow.cpp51
-rw-r--r--src/gui/outfitwindow.h24
-rw-r--r--src/gui/palette.cpp10
-rw-r--r--src/gui/palette.h4
-rw-r--r--src/gui/questswindow.cpp28
-rw-r--r--src/gui/questswindow.h8
-rw-r--r--src/gui/quitdialog.cpp9
-rw-r--r--src/gui/quitdialog.h5
26 files changed, 232 insertions, 232 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 69bba3d93..fcef420bd 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -89,7 +89,7 @@ public:
InventoryWindow::WindowList InventoryWindow::instances;
-InventoryWindow::InventoryWindow(Inventory *inventory):
+InventoryWindow::InventoryWindow(Inventory *const inventory):
Window("Inventory", false, nullptr, "inventory.xml"),
mInventory(inventory),
mDropButton(nullptr),
@@ -125,14 +125,14 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
mItems = new ItemContainer(mInventory);
mItems->addSelectionListener(this);
- gcn::ScrollArea *invenScroll = new ScrollArea(
+ gcn::ScrollArea *const invenScroll = new ScrollArea(
mItems, getOptionBool("showbackground"), "inventory_background.xml");
invenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
mSlotsLabel = new Label(_("Slots:"));
mSlotsBar = new ProgressBar(0.0f, 100, 20, Theme::PROG_INVY_SLOTS);
- int size = config.getIntValue("fontSize");
+ const int size = config.getIntValue("fontSize");
mFilter = new TabStrip("filter_" + getWindowName(), size + 8);
mFilter->addActionListener(this);
mFilter->setActionEventId("tag_");
@@ -286,7 +286,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
if (!inventoryWindow || !inventoryWindow->isVisible())
return;
- Item *item = inventoryWindow->getSelectedItem();
+ Item *const item = inventoryWindow->getSelectedItem();
if (!item)
return;
@@ -310,7 +310,7 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
return;
}
- Item *item = mItems->getSelectedItem();
+ Item *const item = mItems->getSelectedItem();
if (!item)
return;
@@ -411,7 +411,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
{
- Item *item = mItems->getSelectedItem();
+ Item *const item = mItems->getSelectedItem();
if (!item)
return;
@@ -432,7 +432,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
if (event.getButton() == gcn::MouseEvent::LEFT
|| event.getButton() == gcn::MouseEvent::RIGHT)
{
- Item *item = mItems->getSelectedItem();
+ Item *const item = mItems->getSelectedItem();
if (!item)
return;
@@ -545,7 +545,7 @@ void InventoryWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
if (!mInventory || !mInventory->isMainInventory())
return;
- Item *item = mItems->getSelectedItem();
+ Item *const item = mItems->getSelectedItem();
if (mSplit && item && Net::getInventoryHandler()->
canSplit(mItems->getSelectedItem()))
@@ -556,12 +556,12 @@ void InventoryWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
updateButtons(item);
}
-void InventoryWindow::updateButtons(Item *item)
+void InventoryWindow::updateButtons(const Item *item)
{
if (!mInventory || !mInventory->isMainInventory())
return;
- Item *selectedItem = mItems->getSelectedItem();
+ Item *const selectedItem = mItems->getSelectedItem();
if (item && selectedItem != item)
return;
@@ -605,7 +605,7 @@ void InventoryWindow::updateButtons(Item *item)
}
}
-void InventoryWindow::setSplitAllowed(bool allowed)
+void InventoryWindow::setSplitAllowed(const bool allowed)
{
mSplitButton->setVisible(allowed);
}
@@ -628,7 +628,7 @@ void InventoryWindow::processEvent(Channels channel A_UNUSED,
{
if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
- int id = event.getInt("id");
+ const int id = event.getInt("id");
if (id == PlayerInfo::TOTAL_WEIGHT || id == PlayerInfo::MAX_WEIGHT)
updateWeight();
}
@@ -639,8 +639,8 @@ void InventoryWindow::updateWeight()
if (!isMainInventory())
return;
- int total = PlayerInfo::getAttribute(PlayerInfo::TOTAL_WEIGHT);
- int max = PlayerInfo::getAttribute(PlayerInfo::MAX_WEIGHT);
+ const int total = PlayerInfo::getAttribute(PlayerInfo::TOTAL_WEIGHT);
+ const int max = PlayerInfo::getAttribute(PlayerInfo::MAX_WEIGHT);
if (max <= 0)
return;
@@ -652,7 +652,7 @@ void InventoryWindow::updateWeight()
Units::formatWeight(max).c_str()));
}
-void InventoryWindow::slotsChanged(Inventory* inventory)
+void InventoryWindow::slotsChanged(Inventory *const inventory)
{
if (inventory == mInventory)
{
@@ -682,14 +682,15 @@ void InventoryWindow::updateDropButton()
}
else
{
- Item *item = nullptr;
if (mItems)
- item = mItems->getSelectedItem();
+ {
+ const Item *const item = mItems->getSelectedItem();
- if (item && item->getQuantity() > 1)
- mDropButton->setCaption(_("Drop..."));
- else
- mDropButton->setCaption(_("Drop"));
+ if (item && item->getQuantity() > 1)
+ mDropButton->setCaption(_("Drop..."));
+ else
+ mDropButton->setCaption(_("Drop"));
+ }
}
}
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 7829c40b6..fd86db6ea 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -66,7 +66,7 @@ class InventoryWindow : public Window,
/**
* Constructor.
*/
- InventoryWindow(Inventory *inventory);
+ InventoryWindow(Inventory *const inventory);
/**
* Destructor.
@@ -116,7 +116,7 @@ class InventoryWindow : public Window,
/**
* Sets whether the split button should be shown.
*/
- void setSplitAllowed(bool allowed);
+ void setSplitAllowed(const bool allowed);
/**
* Closes the Storage Window, as well as telling the server that the
@@ -124,7 +124,7 @@ class InventoryWindow : public Window,
*/
void close();
- void slotsChanged(Inventory* inventory);
+ void slotsChanged(Inventory *const inventory);
bool isMainInventory() const
{ return mInventory->isMainInventory(); }
@@ -139,7 +139,7 @@ class InventoryWindow : public Window,
void processEvent(Channels channel, const DepricatedEvent &event);
- void updateButtons(Item *item = nullptr);
+ void updateButtons(const Item *item = nullptr);
bool isInputFocused() const;
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index a9498f1b9..d950a1dd4 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -97,7 +97,8 @@ private:
StringVect mStrings;
};
-void ItemAmountWindow::finish(Item *item, int amount, int price, Usage usage)
+void ItemAmountWindow::finish(Item *const item, const int amount,
+ const int price, const Usage usage)
{
switch (usage)
{
@@ -132,8 +133,8 @@ void ItemAmountWindow::finish(Item *item, int amount, int price, Usage usage)
}
}
-ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
- int maxRange):
+ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
+ Item *const item, const int maxRange) :
Window("", true, parent, "amount.xml"),
mItemPriceTextField(nullptr),
mGPLabel(nullptr),
@@ -196,15 +197,15 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
}
//Item icon
- Image *image = item->getImage();
+ Image *const image = item->getImage();
mItemIcon = new Icon(image);
// Buttons
- Button *minusAmountButton = new Button(_("-"), "dec", this);
- Button *plusAmountButton = new Button(_("+"), "inc", this);
- Button *okButton = new Button(_("OK"), "ok", this);
- Button *cancelButton = new Button(_("Cancel"), "cancel", this);
- Button *addAllButton = new Button(_("All"), "all", this);
+ Button *const minusAmountButton = new Button(_("-"), "dec", this);
+ Button *const plusAmountButton = new Button(_("+"), "inc", this);
+ Button *const okButton = new Button(_("OK"), "ok", this);
+ Button *const cancelButton = new Button(_("Cancel"), "cancel", this);
+ Button *const addAllButton = new Button(_("All"), "all", this);
minusAmountButton->adjustSize();
minusAmountButton->setWidth(plusAmountButton->getWidth());
@@ -228,8 +229,8 @@ ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
if (mUsage == ShopBuyAdd || mUsage == ShopSellAdd)
{
- Button *minusPriceButton = new Button(_("-"), "decPrice", this);
- Button *plusPriceButton = new Button(_("+"), "incPrice", this);
+ Button *const minusPriceButton = new Button(_("-"), "decPrice", this);
+ Button *const plusPriceButton = new Button(_("+"), "incPrice", this);
minusPriceButton->adjustSize();
minusPriceButton->setWidth(plusPriceButton->getWidth());
@@ -347,7 +348,7 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
std::string str = mItemsModal->getElementAt(
mItemDropDown->getSelected());
- int id = ItemDB::get(str).getId();
+ const int id = ItemDB::get(str).getId();
mItem = new Item(id, 10000);
@@ -356,8 +357,7 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
else if (!mMax)
mMax = mItem->getQuantity();
- Image *image = mItem->getImage();
- mItemIcon->setImage(image);
+ mItemIcon->setImage(mItem->getImage());
}
int amount = mItemAmountTextField->getValue();
@@ -416,8 +416,8 @@ void ItemAmountWindow::keyReleased(gcn::KeyEvent &keyEvent A_UNUSED)
mItemAmountSlide->setValue(mItemAmountTextField->getValue());
}
-void ItemAmountWindow::showWindow(Usage usage, Window *parent, Item *item,
- int maxRange)
+void ItemAmountWindow::showWindow(const Usage usage, Window *const parent,
+ Item *const item, int maxRange)
{
if (!item)
return;
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index 0e692dac2..c06d9a618 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -86,16 +86,17 @@ class ItemAmountWindow : public Window,
/**
* Creates the dialog, or bypass it if there aren't enough items.
*/
- static void showWindow(Usage usage, Window *parent, Item *item,
- int maxRange = 0);
+ static void showWindow(const Usage usage, Window *const parent,
+ Item *const item, int maxRange = 0);
~ItemAmountWindow();
private:
- static void finish(Item *item, int amount, int price, Usage usage);
+ static void finish(Item *const item, const int amount,
+ const int price, const Usage usage);
- ItemAmountWindow(Usage usage, Window *parent, Item *item,
- int maxRange = 0);
+ ItemAmountWindow(const Usage usage, Window *const parent,
+ Item *const item, const int maxRange = 0);
IntTextField *mItemAmountTextField; /**< Item amount caption. */
IntTextField *mItemPriceTextField; /**< Item price caption. */
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index fa65c7a42..feb9a050d 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -98,7 +98,7 @@ ItemPopup::~ItemPopup()
}
}
-void ItemPopup::setItem(const Item *item, bool showImage)
+void ItemPopup::setItem(const Item *const item, const bool showImage)
{
if (!item)
return;
@@ -120,14 +120,14 @@ void ItemPopup::setItem(const Item *item, bool showImage)
ii.getName().c_str(), item->getRefine(), ii.getId()));
}
mItemName->adjustSize();
- unsigned minWidth = mItemName->getWidth() + 8;
+ const unsigned minWidth = mItemName->getWidth() + 8;
if (static_cast<unsigned>(getWidth()) < minWidth)
setWidth(minWidth);
}
}
-void ItemPopup::setItem(const ItemInfo &item, unsigned char color,
- bool showImage, int id)
+void ItemPopup::setItem(const ItemInfo &item, const unsigned char color,
+ const bool showImage, int id)
{
if (!mIcon || (item.getName() == mLastName && color == mLastColor))
return;
@@ -137,26 +137,25 @@ void ItemPopup::setItem(const ItemInfo &item, unsigned char color,
int space = 0;
- Image *oldImage = mIcon->getImage();
+ Image *const oldImage = mIcon->getImage();
if (oldImage)
oldImage->decRef();
if (showImage)
{
- ResourceManager *resman = ResourceManager::getInstance();
- logger->log("img: " + combineDye2(
- paths.getStringValue("itemIcons")
- + item.getDisplay().image, item.getDyeColorsString(color)));
- Image *image = resman->getImage(combineDye2(
+ ResourceManager *const resman = ResourceManager::getInstance();
+// logger->log("img: " + combineDye2(
+// paths.getStringValue("itemIcons")
+// + item.getDisplay().image, item.getDyeColorsString(color)));
+ Image *const image = resman->getImage(combineDye2(
paths.getStringValue("itemIcons")
+ item.getDisplay().image, item.getDyeColorsString(color)));
mIcon->setImage(image);
if (image)
{
- int x = getPadding();
- int y = getPadding();
- mIcon->setPosition(x, y);
+ const int pad = getPadding();
+ mIcon->setPosition(pad, pad);
space = mIcon->getWidth();
}
}
@@ -233,7 +232,7 @@ void ItemPopup::setItem(const ItemInfo &item, unsigned char color,
(numRowsDesc + getPadding()) * height);
}
-gcn::Color ItemPopup::getColor(ItemType type)
+gcn::Color ItemPopup::getColor(const ItemType type)
{
switch (type)
{
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index e6cda2eae..dd2bae83d 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -60,10 +60,10 @@ class ItemPopup : public Popup
/**
* Sets the info to be displayed given a particular item.
*/
- void setItem(const ItemInfo &item, unsigned char color,
- bool showImage = false, int id = -1);
+ void setItem(const ItemInfo &item, const unsigned char color,
+ const bool showImage = false, int id = -1);
- void setItem(const Item *item, bool showImage = false);
+ void setItem(const Item *const item, const bool showImage = false);
void mouseMoved(gcn::MouseEvent &mouseEvent);
@@ -77,7 +77,7 @@ class ItemPopup : public Popup
std::string mLastName;
unsigned char mLastColor;
- static gcn::Color getColor(ItemType type);
+ static gcn::Color getColor(const ItemType type);
};
#endif // ITEMPOPUP_H
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 564eba642..8c9fe8757 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -58,7 +58,7 @@ KillStats::KillStats():
setDefaultSize(250, 250, 350, 300);
listen(CHANNEL_ATTRIBUTES);
- int xp(PlayerInfo::getAttribute(PlayerInfo::EXP));
+ const int xp(PlayerInfo::getAttribute(PlayerInfo::EXP));
int xpNextLevel(PlayerInfo::getAttribute(PlayerInfo::EXP_NEEDED));
mResetButton = new Button(_("Reset stats"), "reset", this);
@@ -184,7 +184,7 @@ void KillStats::gainXp(int xp)
if (!mKillCounter)
mKillCounter = 1;
- float AvgExp = static_cast<float>(mExpCounter / mKillCounter);
+ const float AvgExp = static_cast<float>(mExpCounter / mKillCounter);
int xpNextLevel(PlayerInfo::getAttribute(PlayerInfo::EXP_NEEDED));
if (mKillTimer == 0)
@@ -246,12 +246,12 @@ void KillStats::gainXp(int xp)
void KillStats::recalcStats()
{
- int curTime = cur_time;
+ const int curTime = cur_time;
// Need Update Exp Counter
if (curTime - m1minExpTime > 60)
{
- int newExp = PlayerInfo::getAttribute(PlayerInfo::EXP);
+ const int newExp = PlayerInfo::getAttribute(PlayerInfo::EXP);
if (m1minExpTime != 0)
m1minSpeed = newExp - m1minExpNum;
else
@@ -262,7 +262,7 @@ void KillStats::recalcStats()
if (curTime - m5minExpTime > 60*5)
{
- int newExp = PlayerInfo::getAttribute(PlayerInfo::EXP);
+ const int newExp = PlayerInfo::getAttribute(PlayerInfo::EXP);
if (m5minExpTime != 0)
m5minSpeed = newExp - m5minExpNum;
else
@@ -273,7 +273,7 @@ void KillStats::recalcStats()
if (curTime - m15minExpTime > 60*15)
{
- int newExp = PlayerInfo::getAttribute(PlayerInfo::EXP);
+ const int newExp = PlayerInfo::getAttribute(PlayerInfo::EXP);
if (m15minExpTime != 0)
m15minSpeed = newExp - m15minExpNum;
else
@@ -376,7 +376,7 @@ void KillStats::updateJackoLabel()
}
}
-void KillStats::jackoDead(int id)
+void KillStats::jackoDead(const int id)
{
if (id == mJackoId && mIsJackoAlive)
{
@@ -387,12 +387,6 @@ void KillStats::jackoDead(int id)
}
}
-void KillStats::addLog(std::string str)
-{
- if (debugChatTab)
- debugChatTab->chatLog(str, BY_SERVER);
-}
-
void KillStats::jackoAlive(int id)
{
if (!mIsJackoAlive)
@@ -411,7 +405,7 @@ void KillStats::validateJacko()
if (!actorSpriteManager || !player_node)
return;
- Map *currentMap = Game::instance()->getCurrentMap();
+ const Map *const currentMap = Game::instance()->getCurrentMap();
if (currentMap)
{
if (currentMap->getProperty("_realfilename") == "018-1"
@@ -422,7 +416,8 @@ void KillStats::validateJacko()
&& player_node->getTileY() >= 21
&& player_node->getTileY() <= 46)
{
- Being *dstBeing = actorSpriteManager->findBeingByName(
+ const Being *const dstBeing
+ = actorSpriteManager->findBeingByName(
"Jack O", Being::MONSTER);
if (mIsJackoAlive && !dstBeing)
{
@@ -443,7 +438,7 @@ void KillStats::processEvent(Channels channel A_UNUSED,
{
if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
- int id = event.getInt("id");
+ const int id = event.getInt("id");
if (id == PlayerInfo::EXP || id == PlayerInfo::EXP_NEEDED)
{
gainXp(event.getInt("newValue") - event.getInt("oldValue"));
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 6f21fc6ed..fdc932735 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -54,6 +54,7 @@ class KillStats : public Window, private gcn::ActionListener, public Listener
* Stuff.
*/
void action(const gcn::ActionEvent &event);
+
void gainXp(int Xp);
/**
@@ -76,12 +77,10 @@ class KillStats : public Window, private gcn::ActionListener, public Listener
*/
void updateJackoLabel();
- void jackoDead(int id);
+ void jackoDead(const int id);
void jackoAlive(int id);
- void addLog(std::string str);
-
void processEvent(Channels channel A_UNUSED,
const DepricatedEvent &event);
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 804a46bad..e105911e8 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -80,7 +80,7 @@ public:
class UpdateListModel : public gcn::ListModel
{
public:
- UpdateListModel(LoginData *data) :
+ UpdateListModel(LoginData *const data) :
gcn::ListModel(),
mLoginData(data)
{
@@ -107,18 +107,18 @@ class UpdateListModel : public gcn::ListModel
LoginData *mLoginData;
};
-LoginDialog::LoginDialog(LoginData *data, std::string serverName,
- std::string *updateHost):
+LoginDialog::LoginDialog(LoginData *const data, std::string serverName,
+ std::string *const updateHost):
Window(_("Login"), false, nullptr, "login.xml"),
mLoginData(data),
mUpdateHost(updateHost),
mServerName(serverName)
{
- gcn::Label *serverLabel1 = new Label(_("Server:"));
- gcn::Label *serverLabel2 = new Label(serverName);
+ gcn::Label *const serverLabel1 = new Label(_("Server:"));
+ gcn::Label *const serverLabel2 = new Label(serverName);
serverLabel2->adjustSize();
- gcn::Label *userLabel = new Label(_("Name:"));
- gcn::Label *passLabel = new Label(_("Password:"));
+ gcn::Label *const userLabel = new Label(_("Name:"));
+ gcn::Label *const passLabel = new Label(_("Password:"));
if (mLoginData && mLoginData->updateHosts.size() > 1)
{
mUpdateHostLabel = new Label(strprintf(_("Update host: %s"),
diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h
index 6adfd36bd..d85e88b8a 100644
--- a/src/gui/logindialog.h
+++ b/src/gui/logindialog.h
@@ -59,8 +59,8 @@ class LoginDialog : public Window, public gcn::ActionListener,
*
* @see Window::Window
*/
- LoginDialog(LoginData *data, std::string serverName,
- std::string *updateHost);
+ LoginDialog(LoginData *const data, std::string serverName,
+ std::string *const updateHost);
~LoginDialog();
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 8cbeebad8..d928e6f8c 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -84,7 +84,7 @@ Minimap::~Minimap()
}
}
-void Minimap::setMap(Map *map)
+void Minimap::setMap(const Map *const map)
{
std::string caption("");
std::string minimapName;
@@ -111,7 +111,7 @@ void Minimap::setMap(Map *map)
{
if (config.getBoolValue("showExtMinimaps"))
{
- SDL_Surface* surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
+ SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_SWSURFACE,
map->getWidth(), map->getHeight(), 32,
0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000);
if (!surface)
@@ -148,7 +148,7 @@ void Minimap::setMap(Map *map)
{
std::string tempname = paths.getStringValue("minimaps")
+ "graphics/minimaps/" + map->getFilename() + ".png";
- ResourceManager *resman = ResourceManager::getInstance();
+ ResourceManager *const resman = ResourceManager::getInstance();
minimapName = map->getProperty("minimap");
@@ -208,7 +208,7 @@ void Minimap::draw(gcn::Graphics *graphics)
if (!userPalette || !player_node || !viewport)
return;
- Graphics *graph = static_cast<Graphics*>(graphics);
+ Graphics *const graph = static_cast<Graphics*>(graphics);
const gcn::Rectangle a = getChildrenArea();
@@ -256,7 +256,7 @@ void Minimap::draw(gcn::Graphics *graphics)
if (!(*it) || (*it)->getType() == ActorSprite::FLOOR_ITEM)
continue;
- const Being *being = static_cast<Being*>(*it);
+ const Being *const being = static_cast<const Being *const>(*it);
if (!being)
continue;
@@ -318,11 +318,12 @@ void Minimap::draw(gcn::Graphics *graphics)
if (player_node->isInParty())
{
- Party *party = player_node->getParty();
+ Party *const party = player_node->getParty();
if (party)
{
- PartyMember *m = party->getMember(player_node->getName());
- Party::MemberList *members = party->getMembers();
+ const PartyMember *const m = party->getMember(
+ player_node->getName());
+ Party::MemberList *const members = party->getMembers();
if (m && members)
{
const std::string curMap = m->getMap();
@@ -331,7 +332,7 @@ void Minimap::draw(gcn::Graphics *graphics)
it_end = members->end();
while (it != it_end)
{
- PartyMember *member = *it;
+ const PartyMember *const member = *it;
if (member && member->getMap() == curMap
&& member->getOnline() && member != m)
{
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 12835edd5..7a6f865f8 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -46,7 +46,7 @@ class Minimap : public Window
/**
* Sets the map image that should be displayed.
*/
- void setMap(Map *map);
+ void setMap(const Map *const map);
/**
* Toggles the displaying of the minimap.
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index e73cc5475..2c4fdda9c 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -69,8 +69,8 @@ MiniStatusWindow::MiniStatusWindow():
mMpBar = nullptr;
}
- int job = Net::getPlayerHandler()->getJobLocation()
- && serverConfig.getValueBool("showJob", false);
+ const int job = Net::getPlayerHandler()->getJobLocation()
+ && serverConfig.getValueBool("showJob", false);
mXpBar = createBar(0, 100, 20, Theme::PROG_EXP,
"xp bar", _("experience bar"));
@@ -111,7 +111,7 @@ MiniStatusWindow::MiniStatusWindow():
mTextPopup = new TextPopup();
addMouseListener(this);
- Inventory *inv = PlayerInfo::getInventory();
+ Inventory *const inv = PlayerInfo::getInventory();
if (inv)
inv->addInventoyListener(this);
@@ -129,7 +129,7 @@ MiniStatusWindow::~MiniStatusWindow()
delete_all(mIcons);
mIcons.clear();
- Inventory *inv = PlayerInfo::getInventory();
+ Inventory *const inv = PlayerInfo::getInventory();
if (inv)
inv->removeInventoyListener(this);
@@ -144,11 +144,12 @@ MiniStatusWindow::~MiniStatusWindow()
}
}
-ProgressBar *MiniStatusWindow::createBar(float progress, int width, int height,
- int color, std::string name,
+ProgressBar *MiniStatusWindow::createBar(const float progress,
+ const int width, const int height,
+ const int color, std::string name,
std::string description)
{
- ProgressBar *bar = new ProgressBar(progress, width, height, color);
+ ProgressBar *const bar = new ProgressBar(progress, width, height, color);
bar->setActionEventId(name);
bar->setId(description);
mBars.push_back(bar);
@@ -159,7 +160,7 @@ ProgressBar *MiniStatusWindow::createBar(float progress, int width, int height,
void MiniStatusWindow::updateBars()
{
int x = 0;
- ProgressBar* lastBar = nullptr;
+ const ProgressBar *lastBar = nullptr;
for (std::vector <ProgressBar*>::const_iterator it = mBars.begin(),
it_end = mBars.end(); it != it_end; ++it)
{
@@ -168,7 +169,7 @@ void MiniStatusWindow::updateBars()
for (std::vector <ProgressBar*>::const_iterator it = mBars.begin(),
it_end = mBars.end(); it != it_end; ++it)
{
- ProgressBar *bar = *it;
+ ProgressBar *const bar = *it;
if (!bar)
continue;
if (bar->isVisible())
@@ -187,7 +188,7 @@ void MiniStatusWindow::updateBars()
}
}
-void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite)
+void MiniStatusWindow::setIcon(const int index, AnimatedSprite *const sprite)
{
if (index >= static_cast<int>(mIcons.size()))
mIcons.resize(index + 1, nullptr);
@@ -197,7 +198,7 @@ void MiniStatusWindow::setIcon(int index, AnimatedSprite *sprite)
mIcons[index] = sprite;
}
-void MiniStatusWindow::eraseIcon(int index)
+void MiniStatusWindow::eraseIcon(const int index)
{
if (index < static_cast<int>(mIcons.size()))
{
@@ -206,7 +207,7 @@ void MiniStatusWindow::eraseIcon(int index)
}
}
-void MiniStatusWindow::drawIcons(Graphics *graphics)
+void MiniStatusWindow::drawIcons(Graphics *const graphics)
{
// Draw icons
int icon_x = mStatusBar->getX() + mStatusBar->getWidth() + 4;
@@ -225,7 +226,7 @@ void MiniStatusWindow::processEvent(Channels channel A_UNUSED,
{
if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
- int id = event.getInt("id");
+ const int id = event.getInt("id");
if (id == PlayerInfo::HP || id == PlayerInfo::MAX_HP)
{
StatusWindow::updateHPBar(mHpBar);
@@ -339,7 +340,7 @@ void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
}
else if (event.getSource() == mJobBar)
{
- std::pair<int, int> exp = PlayerInfo::getStatExperience(
+ const std::pair<int, int> exp = PlayerInfo::getStatExperience(
Net::getPlayerHandler()->getJobLocation());
if (exp.first > exp.second)
@@ -367,7 +368,7 @@ void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
}
else if (event.getSource() == mInvSlotsBar)
{
- Inventory *inv = PlayerInfo::getInventory();
+ const Inventory *const inv = PlayerInfo::getInventory();
if (inv)
{
const int usedSlots = inv->getNumberOfSlotsUsed();
@@ -399,7 +400,7 @@ void MiniStatusWindow::mousePressed(gcn::MouseEvent &event)
if (event.getButton() == gcn::MouseEvent::RIGHT)
{
- ProgressBar *bar = dynamic_cast<ProgressBar*>(event.getSource());
+ ProgressBar *const bar = dynamic_cast<ProgressBar*>(event.getSource());
if (!bar)
return;
if (viewport)
@@ -418,9 +419,9 @@ void MiniStatusWindow::mouseExited(gcn::MouseEvent &event)
mStatusPopup->hide();
}
-void MiniStatusWindow::showBar(std::string name, bool visible)
+void MiniStatusWindow::showBar(const std::string &name, const bool visible)
{
- ProgressBar *bar = mBarNames[name];
+ ProgressBar *const bar = mBarNames[name];
if (!bar)
return;
bar->setVisible(visible);
@@ -448,7 +449,7 @@ void MiniStatusWindow::loadBars()
std::string str = config.getValue("ministatus" + toString(f), "");
if (str == "" || str == "status bar")
continue;
- ProgressBar *bar = mBarNames[str];
+ ProgressBar *const bar = mBarNames[str];
if (!bar)
continue;
bar->setVisible(false);
@@ -461,7 +462,7 @@ void MiniStatusWindow::saveBars()
for (std::vector <ProgressBar*>::const_iterator it = mBars.begin(),
it_end = mBars.end(); it != it_end; ++it)
{
- ProgressBar *bar = *it;
+ const ProgressBar *const bar = *it;
if (!bar->isVisible())
{
config.setValue("ministatus" + toString(i),
@@ -475,7 +476,7 @@ void MiniStatusWindow::saveBars()
config.setValue("ministatussaved", true);
}
-void MiniStatusWindow::slotsChanged(Inventory* inventory)
+void MiniStatusWindow::slotsChanged(Inventory *const inventory)
{
if (!inventory)
return;
diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h
index dfc945689..d67cf8b03 100644
--- a/src/gui/ministatuswindow.h
+++ b/src/gui/ministatuswindow.h
@@ -53,11 +53,11 @@ class MiniStatusWindow : public Popup,
/**
* Sets one of the icons.
*/
- void setIcon(int index, AnimatedSprite *sprite);
+ void setIcon(const int index, AnimatedSprite *const sprite);
- void eraseIcon(int index);
+ void eraseIcon(const int index);
- void drawIcons(Graphics *graphics);
+ void drawIcons(Graphics *const graphics);
void processEvent(Channels channel, const DepricatedEvent &event);
@@ -73,13 +73,13 @@ class MiniStatusWindow : public Popup,
void mouseExited(gcn::MouseEvent &event);
- void showBar(std::string name, bool visible);
+ void showBar(const std::string &name, const bool visible);
void updateBars();
void updateArrows();
- void slotsChanged(Inventory* inventory);
+ void slotsChanged(Inventory *const inventory);
std::vector <ProgressBar*> &getBars()
{ return mBars; }
@@ -87,9 +87,9 @@ class MiniStatusWindow : public Popup,
private:
bool isInBar(ProgressBar *bar, int x, int y) const;
- ProgressBar *createBar(float progress, int width, int height,
- int color, std::string name,
- std::string description);
+ ProgressBar *createBar(const float progress, const int width,
+ const int height, const int color,
+ std::string name, std::string description);
void loadBars();
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 166cef5b1..85228c19a 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -59,7 +59,7 @@
NpcDialog::DialogList NpcDialog::instances;
-NpcDialog::NpcDialog(int npcId) :
+NpcDialog::NpcDialog(const int npcId) :
Window(_("NPC"), false, nullptr, "npc.xml"),
mNpcId(npcId),
mLogInteraction(config.getBoolValue("logNpcInGui")),
@@ -140,7 +140,7 @@ NpcDialog::NpcDialog(int npcId) :
mPlusButton = new Button(_("+"), "inc", this);
mMinusButton = new Button(_("-"), "dec", this);
- gcn::Font *fnt = mButton->getFont();
+ const gcn::Font *const fnt = mButton->getFont();
int width = std::max(fnt->getWidth(CAPTION_WAITING),
fnt->getWidth(CAPTION_NEXT));
width = std::max(width, fnt->getWidth(CAPTION_CLOSE));
@@ -226,7 +226,7 @@ void NpcDialog::setText(const std::string &text)
}
*/
-void NpcDialog::addText(const std::string &text, bool save)
+void NpcDialog::addText(const std::string &text, const bool save)
{
if (save || mLogInteraction)
{
@@ -279,7 +279,7 @@ void NpcDialog::action(const gcn::ActionEvent &event)
if (mInputState == NPC_INPUT_LIST)
{
unsigned char choice = 0;
- int selectedIndex = mItemList->getSelected();
+ const int selectedIndex = mItemList->getSelected();
if (selectedIndex >= static_cast<int>(mItems.size())
|| selectedIndex < 0
@@ -395,7 +395,7 @@ void NpcDialog::addChoice(const std::string &choice)
void NpcDialog::parseListItems(const std::string &itemString)
{
std::istringstream iss(itemString);
- ResourceManager *resman = ResourceManager::getInstance();
+ ResourceManager *const resman = ResourceManager::getInstance();
std::string tmp;
while (getline(iss, tmp, ':'))
@@ -409,7 +409,8 @@ void NpcDialog::parseListItems(const std::string &itemString)
else
{
mItems.push_back(tmp.substr(pos + 1));
- Image *img = resman->getImage(paths.getStringValue("guiIcons")
+ Image *const img = resman->getImage(
+ paths.getStringValue("guiIcons")
+ tmp.substr(0, pos) + ".png");
mImages.push_back(img);
}
@@ -464,7 +465,8 @@ bool NpcDialog::isAnyInputFocused()
return false;
}
-void NpcDialog::integerRequest(int defaultValue, int min, int max)
+void NpcDialog::integerRequest(const int defaultValue, const int min,
+ const int max)
{
mActionState = NPC_ACTION_INPUT;
mInputState = NPC_INPUT_INTEGER;
@@ -474,7 +476,7 @@ void NpcDialog::integerRequest(int defaultValue, int min, int max)
buildLayout();
}
-void NpcDialog::move(int amount)
+void NpcDialog::move(const int amount)
{
if (mActionState != NPC_ACTION_INPUT)
return;
@@ -687,9 +689,9 @@ void NpcDialog::restoreCamera()
mCameraMode = -1;
}
-void NpcDialog::showAvatar(int avatarId)
+void NpcDialog::showAvatar(const int avatarId)
{
- bool needShow = (avatarId != 0);
+ const bool needShow = (avatarId != 0);
if (needShow)
{
delete mAvatarBeing;
@@ -698,13 +700,11 @@ void NpcDialog::showAvatar(int avatarId)
if (!mAvatarBeing->empty())
{
mAvatarBeing->logic();
- Sprite *sprite = mAvatarBeing->getSprite(0);
+ const Sprite *const sprite = mAvatarBeing->getSprite(0);
if (sprite)
{
- int width = sprite->getWidth() + 2 * getPadding();
- mPlayerBox->setWidth(width);
- int height = sprite->getHeight() + 2 * getPadding();
- mPlayerBox->setHeight(height);
+ mPlayerBox->setWidth(sprite->getWidth() + 2 * getPadding());
+ mPlayerBox->setHeight(sprite->getHeight() + 2 * getPadding());
}
}
}
@@ -725,16 +725,16 @@ void NpcDialog::showAvatar(int avatarId)
}
}
-void NpcDialog::setAvatarDirection(uint8_t direction)
+void NpcDialog::setAvatarDirection(const uint8_t direction)
{
- Being *being = mPlayerBox->getBeing();
+ Being *const being = mPlayerBox->getBeing();
if (being)
being->setDirection(direction);
}
-void NpcDialog::setAvatarAction(int actionId)
+void NpcDialog::setAvatarAction(const int actionId)
{
- Being *being = mPlayerBox->getBeing();
+ Being *const being = mPlayerBox->getBeing();
if (being)
being->setAction(static_cast<Being::Action>(actionId));
}
@@ -747,7 +747,7 @@ void NpcDialog::logic()
mAvatarBeing->logic();
if (mPlayerBox->getWidth() < static_cast<signed>(3 * getPadding()))
{
- Sprite *sprite = mAvatarBeing->getSprite(0);
+ const Sprite *const sprite = mAvatarBeing->getSprite(0);
if (sprite)
{
mPlayerBox->setWidth(sprite->getWidth() + 2 * getPadding());
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index cd5f7fe57..2d7ed5149 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -64,7 +64,7 @@ class NpcDialog : public Window, public gcn::ActionListener,
*
* @see Window::Window
*/
- NpcDialog(int npcId);
+ NpcDialog(const int npcId);
~NpcDialog();
@@ -86,7 +86,7 @@ class NpcDialog : public Window, public gcn::ActionListener,
*
* @param string The text to add.
*/
- void addText(const std::string &string, bool save = true);
+ void addText(const std::string &string, const bool save = true);
/**
* When called, the widget will show a "Next" button.
@@ -155,10 +155,10 @@ class NpcDialog : public Window, public gcn::ActionListener,
/**
* Requests a interger from the user.
*/
- void integerRequest(int defaultValue = 0, int min = 0,
- int max = 2147483647);
+ void integerRequest(const int defaultValue = 0, const int min = 0,
+ const int max = 2147483647);
- void move(int amount);
+ void move(const int amount);
void setVisible(bool visible);
@@ -192,11 +192,11 @@ class NpcDialog : public Window, public gcn::ActionListener,
void refocus();
- void showAvatar(int avatarId);
+ void showAvatar(const int avatarId);
- void setAvatarDirection(uint8_t direction);
+ void setAvatarDirection(const uint8_t direction);
- void setAvatarAction(int actionId);
+ void setAvatarAction(const int actionId);
void logic();
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index 30a6281eb..4b816794e 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -36,8 +36,8 @@
#include "debug.h"
OkDialog::OkDialog(const std::string &title, const std::string &msg,
- int soundEvent, bool modal, bool showCenter,
- Window *parent):
+ const int soundEvent, const bool modal,
+ const bool showCenter, Window *const parent):
Window(title, modal, parent, "ok.xml")
{
mTextBox = new TextBox;
@@ -45,7 +45,7 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
mTextBox->setOpaque(false);
mTextBox->setTextWrapped(msg, 260);
- gcn::Button *okButton = new Button(_("OK"), "ok", this);
+ gcn::Button *const okButton = new Button(_("OK"), "ok", this);
const int numRows = mTextBox->getNumberOfRows();
const int fontHeight = getFont()->getHeight();
diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h
index b6f17480b..676fe4a80 100644
--- a/src/gui/okdialog.h
+++ b/src/gui/okdialog.h
@@ -52,8 +52,8 @@ class OkDialog : public Window, public gcn::ActionListener
* @see Window::Window
*/
OkDialog(const std::string &title, const std::string &msg,
- int soundEvent = DIALOG_OK, bool modal = true,
- bool showCenter = true, Window *parent = nullptr);
+ const int soundEvent = DIALOG_OK, const bool modal = true,
+ const bool showCenter = true, Window *const parent = nullptr);
/**
* Called when receiving actions from the widgets.
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 93257c6c3..3095e7ce8 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -122,9 +122,9 @@ OutfitWindow::~OutfitWindow()
save();
}
-void OutfitWindow::load(bool oldConfig)
+void OutfitWindow::load(const bool oldConfig)
{
- Configuration *cfg;
+ const Configuration *cfg;
if (oldConfig)
cfg = &config;
else
@@ -185,7 +185,7 @@ void OutfitWindow::save()
bool good = false;
for (unsigned i = 0; i < OUTFIT_ITEM_COUNT; i++)
{
- int res = mItems[o][i] ? mItems[o][i] : -1;
+ const int res = mItems[o][i] ? mItems[o][i] : -1;
if (res != -1)
good = true;
outfitStr += toString(res);
@@ -252,11 +252,12 @@ void OutfitWindow::action(const gcn::ActionEvent &event)
}
}
-void OutfitWindow::wearOutfit(int outfit, bool unwearEmpty, bool select)
+void OutfitWindow::wearOutfit(const int outfit, const bool unwearEmpty,
+ const bool select)
{
bool isEmpty = true;
- Item *item;
+ const Item *item;
if (outfit < 0 || outfit > static_cast<int>(OUTFITS_COUNT))
return;
@@ -286,12 +287,12 @@ void OutfitWindow::wearOutfit(int outfit, bool unwearEmpty, bool select)
}
}
-void OutfitWindow::copyOutfit(int outfit)
+void OutfitWindow::copyOutfit(const int outfit)
{
copyOutfit(outfit, mCurrentOutfit);
}
-void OutfitWindow::copyOutfit(int src, int dst)
+void OutfitWindow::copyOutfit(const int src, const int dst)
{
if (src < 0 || src > static_cast<int>(OUTFITS_COUNT)
|| dst < 0 || dst > static_cast<int>(OUTFITS_COUNT))
@@ -306,7 +307,7 @@ void OutfitWindow::copyOutfit(int src, int dst)
void OutfitWindow::draw(gcn::Graphics *graphics)
{
Window::draw(graphics);
- Graphics *g = static_cast<Graphics*>(graphics);
+ Graphics *const g = static_cast<Graphics*>(graphics);
for (unsigned int i = 0; i < OUTFIT_ITEM_COUNT; i++)
{
@@ -322,15 +323,15 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
continue;
bool foundItem = false;
- Inventory *inv = PlayerInfo::getInventory();
+ const Inventory *const inv = PlayerInfo::getInventory();
if (inv)
{
- Item *item = inv->findItem(mItems[mCurrentOutfit][i],
+ const Item *const item = inv->findItem(mItems[mCurrentOutfit][i],
mItemColors[mCurrentOutfit][i]);
if (item)
{
// Draw item icon.
- Image* image = item->getImage();
+ const Image *const image = item->getImage();
if (image)
{
g->drawImage(image, itemX, itemY);
@@ -340,7 +341,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
}
if (!foundItem)
{
- Image *image = Item::getImage(mItems[mCurrentOutfit][i],
+ Image *const image = Item::getImage(mItems[mCurrentOutfit][i],
mItemColors[mCurrentOutfit][i]);
if (image)
{
@@ -352,7 +353,7 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
if (mItemMoved)
{
// Draw the item image being dragged by the cursor.
- Image* image = mItemMoved->getImage();
+ const Image *const image = mItemMoved->getImage();
if (image)
{
const int tPosX = mCursorPosX - (image->mBounds.w / 2);
@@ -385,10 +386,10 @@ void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
}
mMoved = false;
event.consume();
- Inventory *inv = PlayerInfo::getInventory();
+ const Inventory *const inv = PlayerInfo::getInventory();
if (inv)
{
- Item *item = inv->findItem(itemId, itemColor);
+ Item *const item = inv->findItem(itemId, itemColor);
if (item)
mItemMoved = item;
else
@@ -468,7 +469,7 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event)
Window::mouseReleased(event);
}
-int OutfitWindow::getIndexFromGrid(int pointX, int pointY) const
+int OutfitWindow::getIndexFromGrid(const int pointX, const int pointY) const
{
const gcn::Rectangle tRect = gcn::Rectangle(
10, 25, mGridWidth * mBoxWidth, mGridHeight * mBoxHeight);
@@ -481,17 +482,17 @@ int OutfitWindow::getIndexFromGrid(int pointX, int pointY) const
return index;
}
-void OutfitWindow::unequipNotInOutfit(int outfit)
+void OutfitWindow::unequipNotInOutfit(const int outfit) const
{
// here we think that outfit is correct index
- Inventory *inventory = PlayerInfo::getInventory();
+ const Inventory *const inventory = PlayerInfo::getInventory();
if (!inventory)
return;
for (unsigned i = 0; i < inventory->getSize(); i++)
{
- Item *item = inventory->getItem(i);
+ const Item *const item = inventory->getItem(i);
if (item && item->isEquipped())
{
bool found = false;
@@ -509,7 +510,7 @@ void OutfitWindow::unequipNotInOutfit(int outfit)
}
}
-std::string OutfitWindow::keyName(int number)
+std::string OutfitWindow::keyName(const int number) const
{
if (number < 0 || number >= SHORTCUT_EMOTES)
return "";
@@ -544,7 +545,7 @@ void OutfitWindow::showCurrentOutfit()
mAwayOutfitCheck->setSelected(mAwayOutfit == mCurrentOutfit);
}
-void OutfitWindow::wearNextOutfit(bool all)
+void OutfitWindow::wearNextOutfit(const bool all)
{
next();
if (!all && mCurrentOutfit < static_cast<int>(OUTFITS_COUNT))
@@ -565,7 +566,7 @@ void OutfitWindow::wearNextOutfit(bool all)
wearOutfit(mCurrentOutfit);
}
-void OutfitWindow::wearPreviousOutfit(bool all)
+void OutfitWindow::wearPreviousOutfit(const bool all)
{
previous();
if (!all && mCurrentOutfit < static_cast<int>(OUTFITS_COUNT))
@@ -591,9 +592,9 @@ void OutfitWindow::copyFromEquiped()
copyFromEquiped(mCurrentOutfit);
}
-void OutfitWindow::copyFromEquiped(int dst)
+void OutfitWindow::copyFromEquiped(const int dst)
{
- Inventory *inventory = PlayerInfo::getInventory();
+ const Inventory *const inventory = PlayerInfo::getInventory();
if (!inventory)
return;
@@ -601,7 +602,7 @@ void OutfitWindow::copyFromEquiped(int dst)
for (unsigned i = 0, sz = inventory->getSize(); i < sz; i++)
{
- const Item *item = inventory->getItem(i);
+ const Item *const item = inventory->getItem(i);
if (item && item->isEquipped())
{
mItems[dst][outfitCell] = item->getId();
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 9aae112e3..3d7bb33bc 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -65,9 +65,9 @@ class OutfitWindow : public Window, private gcn::ActionListener
void mouseReleased(gcn::MouseEvent &event);
- void load(bool oldConfig = false);
+ void load(const bool oldConfig = false);
- void setItemSelected(int itemId)
+ void setItemSelected(const int itemId)
{ mItemSelected = itemId; }
void setItemSelected(Item *item);
@@ -75,26 +75,26 @@ class OutfitWindow : public Window, private gcn::ActionListener
bool isItemSelected() const
{ return mItemSelected > 0; }
- void wearOutfit(int outfit, bool unwearEmpty = true,
- bool select = false);
+ void wearOutfit(const int outfit, const bool unwearEmpty = true,
+ const bool select = false);
- void copyOutfit(int outfit);
+ void copyOutfit(const int outfit);
- void copyOutfit(int src, int dst);
+ void copyOutfit(const int src, const int dst);
void copyFromEquiped();
- void copyFromEquiped(int dst);
+ void copyFromEquiped(const int dst);
- void unequipNotInOutfit(int outfit);
+ void unequipNotInOutfit(const int outfit) const;
void next();
void previous();
- void wearNextOutfit(bool all = false);
+ void wearNextOutfit(const bool all = false);
- void wearPreviousOutfit(bool all = false);
+ void wearPreviousOutfit(const bool all = false);
void wearAwayOutfit();
@@ -102,7 +102,7 @@ class OutfitWindow : public Window, private gcn::ActionListener
void showCurrentOutfit();
- std::string keyName(int number) A_PURE;
+ std::string keyName(const int number) const;
void clearCurrentOutfit();
@@ -115,7 +115,7 @@ class OutfitWindow : public Window, private gcn::ActionListener
CheckBox *mAwayOutfitCheck;
Label *mKeyLabel;
- int getIndexFromGrid(int pointX, int pointY) const;
+ int getIndexFromGrid(const int pointX, const int pointY) const;
int mBoxWidth;
int mBoxHeight;
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index f0380153f..94604c128 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -52,7 +52,7 @@ const gcn::Color Palette::RAINBOW_COLORS[7] =
/** Number of Elemets of RAINBOW_COLORS */
const int Palette::RAINBOW_COLOR_COUNT = 7;
-Palette::Palette(int size) :
+Palette::Palette(const int size) :
mRainbowTime(tick_time),
mColors(Colors(size))
{
@@ -64,9 +64,9 @@ Palette::~Palette()
mInstances.erase(this);
}
-const gcn::Color& Palette::getColor(char c, bool &valid)
+const gcn::Color& Palette::getColor(const char c, bool &valid)
{
- CharColors::const_iterator it = mCharColors.find(c);
+ const CharColors::const_iterator it = mCharColors.find(c);
if (it != mCharColors.end())
{
valid = true;
@@ -94,7 +94,7 @@ void Palette::advanceGradient()
// For slower systems, advance can be greater than one (advance > 1
// skips advance-1 steps). Should make gradient look the same
// independent of the framerate.
- int advance = get_elapsed_time(mRainbowTime) / 5;
+ const int advance = get_elapsed_time(mRainbowTime) / 5;
double startColVal, destColVal;
for (size_t i = 0, sz = mGradVector.size(); i < sz; i++)
@@ -121,7 +121,7 @@ void Palette::advanceGradient()
else
colIndex = mGradVector[i]->gradientIndex;
- ColorElem *elem = mGradVector[i];
+ ColorElem *const elem = mGradVector[i];
gcn::Color &color = elem->color;
if (elem->grad == PULSE)
diff --git a/src/gui/palette.h b/src/gui/palette.h
index a4ac5d44b..836ec77e6 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -65,7 +65,7 @@ class Palette
*
* @return the requested color or Palette::BLACK
*/
- const gcn::Color &getColor(char c, bool &valid);
+ const gcn::Color &getColor(const char c, bool &valid);
/**
* Gets the color associated with the type. Sets the alpha channel
@@ -141,7 +141,7 @@ class Palette
/**
* Constructor
*/
- Palette(int size);
+ Palette(const int size);
/**
* Destructor
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index d9f039fa8..51ad76505 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -47,7 +47,7 @@
struct QuestItemText
{
- QuestItemText(std::string text0, int type0) :
+ QuestItemText(std::string text0, const int type0) :
text(text0), type(type0)
{
}
@@ -168,7 +168,7 @@ QuestsWindow::~QuestsWindow()
void QuestsWindow::loadXml()
{
XML::Document doc("quests.xml");
- XmlNodePtr root = doc.rootNode();
+ const XmlNodePtr root = doc.rootNode();
if (!root)
return;
@@ -176,7 +176,7 @@ void QuestsWindow::loadXml()
{
if (xmlNameEqual(varNode, "var"))
{
- int id = XML::getProperty(varNode, "id", 0);
+ const int id = XML::getProperty(varNode, "id", 0);
if (id < 0)
continue;
for_each_xml_child_node(questNode, varNode)
@@ -188,7 +188,7 @@ void QuestsWindow::loadXml()
}
}
-void QuestsWindow::loadQuest(int var, XmlNodePtr node)
+void QuestsWindow::loadQuest(const int var, const XmlNodePtr node)
{
QuestItem *quest = new QuestItem();
quest->name = XML::langProperty(node, "name", _("unknown"));
@@ -213,7 +213,7 @@ void QuestsWindow::loadQuest(int var, XmlNodePtr node)
{
if (!xmlTypeEqual(dataNode, XML_ELEMENT_NODE))
continue;
- const char *data = reinterpret_cast<const char*>(
+ const char *const data = reinterpret_cast<const char*>(
xmlNodeGetContent(dataNode));
if (!data)
continue;
@@ -232,7 +232,7 @@ void QuestsWindow::action(const gcn::ActionEvent &event)
const std::string &eventId = event.getId();
if (eventId == "select")
{
- int id = mQuestsListBox->getSelected();
+ const int id = mQuestsListBox->getSelected();
if (id < 0)
return;
showQuest(mQuestLinks[id]);
@@ -243,12 +243,12 @@ void QuestsWindow::action(const gcn::ActionEvent &event)
}
}
-void QuestsWindow::updateQuest(int var, int val)
+void QuestsWindow::updateQuest(const int var, const int val)
{
mVars[var] = val;
}
-void QuestsWindow::rebuild(bool playSound)
+void QuestsWindow::rebuild(const bool playSound)
{
mQuestsModel->clear();
mQuestLinks.clear();
@@ -262,15 +262,15 @@ void QuestsWindow::rebuild(bool playSound)
for (std::map<int, int>::const_iterator it = mVars.begin(),
it_end = mVars.end(); it != it_end; ++ it)
{
- int var = (*it).first;
- int val = (*it).second;
+ const int var = (*it).first;
+ const int val = (*it).second;
const std::vector<QuestItem*> &quests = mQuests[var];
for (std::vector<QuestItem*>::const_iterator it2 = quests.begin(),
it2_end = quests.end(); it2 != it2_end; ++ it2)
{
if (!*it2)
continue;
- QuestItem *quest = *it2;
+ QuestItem *const quest = *it2;
// complete quest
if (quest->complete.find(val) != quest->complete.end())
complete.push_back(quest);
@@ -285,7 +285,7 @@ void QuestsWindow::rebuild(bool playSound)
for (std::vector<QuestItem*>::const_iterator it = complete.begin(),
it_end = complete.end(); it != it_end; ++ it, k ++)
{
- QuestItem *quest = *it;
+ QuestItem *const quest = *it;
if (quest->completeFlag == 0)
{
updatedQuest = k;
@@ -308,7 +308,7 @@ void QuestsWindow::rebuild(bool playSound)
for (std::vector<QuestItem*>::const_iterator it = incomplete.begin(),
it_end = incomplete.end(); it != it_end; ++ it, k ++)
{
- QuestItem *quest = *it;
+ QuestItem *const quest = *it;
if (quest->completeFlag == -1)
{
updatedQuest = k;
@@ -353,7 +353,7 @@ void QuestsWindow::rebuild(bool playSound)
}
}
-void QuestsWindow::showQuest(QuestItem *quest)
+void QuestsWindow::showQuest(const QuestItem *const quest)
{
if (!quest)
return;
diff --git a/src/gui/questswindow.h b/src/gui/questswindow.h
index 706f6ba1c..30815d751 100644
--- a/src/gui/questswindow.h
+++ b/src/gui/questswindow.h
@@ -58,16 +58,16 @@ class QuestsWindow : public Window, public gcn::ActionListener
*/
void action(const gcn::ActionEvent &event);
- void updateQuest(int var, int val);
+ void updateQuest(const int var, const int val);
- void rebuild(bool playSound);
+ void rebuild(const bool playSound);
- void showQuest(QuestItem *quest);
+ void showQuest(const QuestItem *const quest);
private:
void loadXml();
- void loadQuest(int var, XmlNodePtr node);
+ void loadQuest(const int var, const XmlNodePtr node);
QuestsModel *mQuestsModel;
ExtendedListBox *mQuestsListBox;
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 64048dcc9..c84ddc122 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -46,7 +46,7 @@
#include "debug.h"
-QuitDialog::QuitDialog(QuitDialog** pointerToMe):
+QuitDialog::QuitDialog(QuitDialog **const pointerToMe):
Window(_("Quit"), true, nullptr, "quit.xml"),
mLogoutQuit(new RadioButton(_("Quit"), "quitdialog")),
mForceQuit(new RadioButton(_("Quit"), "quitdialog")),
@@ -113,7 +113,8 @@ QuitDialog::~QuitDialog()
mSwitchCharacter = nullptr;
}
-void QuitDialog::placeOption(ContainerPlacer &placer, gcn::RadioButton *option)
+void QuitDialog::placeOption(ContainerPlacer &placer,
+ gcn::RadioButton *const option)
{
placer(0, static_cast<int>(mOptions.size()), option, 3);
mOptions.push_back(option);
@@ -125,7 +126,7 @@ void QuitDialog::action(const gcn::ActionEvent &event)
{
if (viewport)
{
- Map *map = viewport->getCurrentMap();
+ Map *const map = viewport->getCurrentMap();
if (map)
map->saveExtraLayer();
}
@@ -159,7 +160,7 @@ void QuitDialog::action(const gcn::ActionEvent &event)
void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent)
{
- int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
+ const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId();
int dir = 0;
switch (actionId)
diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h
index 175812bad..5a4134d3a 100644
--- a/src/gui/quitdialog.h
+++ b/src/gui/quitdialog.h
@@ -50,7 +50,7 @@ class QuitDialog : public Window, public gcn::ActionListener,
*
* @pointerToMe will be set to NULL when the QuitDialog is destroyed
*/
- QuitDialog(QuitDialog **pointerToMe);
+ QuitDialog(QuitDialog **const pointerToMe);
/**
* Destructor
@@ -65,7 +65,8 @@ class QuitDialog : public Window, public gcn::ActionListener,
void keyPressed(gcn::KeyEvent &keyEvent);
private:
- void placeOption(ContainerPlacer &placer, gcn::RadioButton *option);
+ void placeOption(ContainerPlacer &placer,
+ gcn::RadioButton *const option);
std::vector<gcn::RadioButton*> mOptions;
gcn::RadioButton *mLogoutQuit;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 18:08:40 +0000