summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/chatwindow.cpp14
-rw-r--r--src/gui/chatwindow.h4
-rw-r--r--src/gui/inventorywindow.cpp8
-rw-r--r--src/gui/inventorywindow.h4
-rw-r--r--src/gui/killstats.cpp8
-rw-r--r--src/gui/killstats.h6
-rw-r--r--src/gui/ministatuswindow.cpp10
-rw-r--r--src/gui/ministatuswindow.h4
-rw-r--r--src/gui/statuswindow.cpp10
-rw-r--r--src/gui/statuswindow.h4
10 files changed, 36 insertions, 36 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 452d2420e..4fa608f35 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -159,7 +159,7 @@ ChatWindow::ChatWindow():
mGMLoaded(false)
{
listen(CHANNEL_NOTICES);
- listen(Mana::CHANNEL_ATTRIBUTES);
+ listen(CHANNEL_ATTRIBUTES);
setWindowName("Chat");
@@ -866,19 +866,19 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
addInputText(Temp, false);
}
-void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event)
+void ChatWindow::processEvent(Channels channel, const Event &event)
{
- if (channel == Mana::CHANNEL_NOTICES)
+ if (channel == CHANNEL_NOTICES)
{
- if (event.getName() == Mana::EVENT_SERVERNOTICE && localChatTab)
+ if (event.getName() == EVENT_SERVERNOTICE && localChatTab)
localChatTab->chatLog(event.getString("message"), BY_SERVER);
}
- else if (channel == Mana::CHANNEL_ATTRIBUTES)
+ else if (channel == CHANNEL_ATTRIBUTES)
{
if (!config.getBoolValue("showBattleEvents"))
return;
- if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
+ if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
switch (event.getInt("id"))
{
@@ -902,7 +902,7 @@ void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event)
break;
};
}
- else if (event.getName() == Mana::EVENT_UPDATESTAT)
+ else if (event.getName() == EVENT_UPDATESTAT)
{
if (!config.getBoolValue("showJobExp"))
return;
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 82e3d31f2..b3dce33fc 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -80,7 +80,7 @@ struct CHATLOG
class ChatWindow : public Window,
public gcn::ActionListener,
public gcn::KeyListener,
- public Mana::Listener
+ public Listener
{
public:
/**
@@ -190,7 +190,7 @@ class ChatWindow : public Window,
*/
void mousePressed(gcn::MouseEvent &event);
- void processEvent(Mana::Channels channel, const Mana::Event &event);
+ void processEvent(Channels channel, const Event &event);
/**
* Scrolls the chat window
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 23f1e6fcf..8c59d10eb 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -113,7 +113,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
setWindowName("Inventory");
}
- listen(Mana::CHANNEL_ATTRIBUTES);
+ listen(CHANNEL_ATTRIBUTES);
if (setupWindow)
setupWindow->registerWindowForReset(this);
@@ -585,10 +585,10 @@ void InventoryWindow::close()
}
}
-void InventoryWindow::processEvent(Mana::Channels channel A_UNUSED,
- const Mana::Event &event)
+void InventoryWindow::processEvent(Channels channel A_UNUSED,
+ const Event &event)
{
- if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
+ if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
int id = event.getInt("id");
if (id == TOTAL_WEIGHT || id == MAX_WEIGHT)
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 9d4be5afc..08456ba29 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -54,7 +54,7 @@ class InventoryWindow : public Window,
public gcn::KeyListener,
public gcn::SelectionListener,
public InventoryListener,
- public Mana::Listener
+ public Listener
{
public:
/**
@@ -126,7 +126,7 @@ class InventoryWindow : public Window,
void updateDropButton();
- void processEvent(Mana::Channels channel, const Mana::Event &event);
+ void processEvent(Channels channel, const Event &event);
void updateButtons(Item *item = nullptr);
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 972c660ec..357a016f2 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -60,7 +60,7 @@ KillStats::KillStats():
setStickyButtonLock(true);
setDefaultSize(250, 250, 350, 300);
- listen(Mana::CHANNEL_ATTRIBUTES);
+ listen(CHANNEL_ATTRIBUTES);
int xp(PlayerInfo::getAttribute(EXP));
int xpNextLevel(PlayerInfo::getAttribute(EXP_NEEDED));
@@ -438,10 +438,10 @@ void KillStats::validateJacko()
}
}
-void KillStats::processEvent(Mana::Channels channel A_UNUSED,
- const Mana::Event &event)
+void KillStats::processEvent(Channels channel A_UNUSED,
+ const Event &event)
{
- if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
+ if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
int id = event.getInt("id");
if (id == EXP || id == EXP_NEEDED)
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 8562e67a4..9773190de 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -33,7 +33,7 @@
class Label;
class Button;
-class KillStats : public Window, gcn::ActionListener, public Mana::Listener
+class KillStats : public Window, gcn::ActionListener, public Listener
{
public:
/**
@@ -78,8 +78,8 @@ class KillStats : public Window, gcn::ActionListener, public Mana::Listener
void addLog(std::string str);
- void processEvent(Mana::Channels channel A_UNUSED,
- const Mana::Event &event);
+ void processEvent(Channels channel A_UNUSED,
+ const Event &event);
private:
void validateJacko();
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 00df97813..aaccd36c8 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -54,7 +54,7 @@ extern volatile int tick_time;
MiniStatusWindow::MiniStatusWindow():
Popup("MiniStatus", "ministatus.xml")
{
- listen(Mana::CHANNEL_ATTRIBUTES);
+ listen(CHANNEL_ATTRIBUTES);
mHpBar = createBar(0, 100, 20, Theme::PROG_HP, "hp bar", _("health bar"));
StatusWindow::updateHPBar(mHpBar);
@@ -218,10 +218,10 @@ void MiniStatusWindow::drawIcons(Graphics *graphics)
}
}
-void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED,
- const Mana::Event &event)
+void MiniStatusWindow::processEvent(Channels channel A_UNUSED,
+ const Event &event)
{
- if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
+ if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
int id = event.getInt("id");
if (id == HP || id == MAX_HP)
@@ -235,7 +235,7 @@ void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED,
else if (id == MONEY)
StatusWindow::updateMoneyBar(mMoneyBar);
}
- else if (event.getName() == Mana::EVENT_UPDATESTAT)
+ else if (event.getName() == EVENT_UPDATESTAT)
{
StatusWindow::updateMPBar(mMpBar);
StatusWindow::updateJobBar(mJobBar);
diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h
index ca18e1b92..ba2cf7b2d 100644
--- a/src/gui/ministatuswindow.h
+++ b/src/gui/ministatuswindow.h
@@ -44,7 +44,7 @@ class TextPopup;
*/
class MiniStatusWindow : public Popup,
public InventoryListener,
- public Mana::Listener
+ public Listener
{
public:
MiniStatusWindow();
@@ -60,7 +60,7 @@ class MiniStatusWindow : public Popup,
void drawIcons(Graphics *graphics);
- void processEvent(Mana::Channels channel, const Mana::Event &event);
+ void processEvent(Channels channel, const Event &event);
void updateStatus();
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 3fbec4f35..25403e544 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -126,7 +126,7 @@ StatusWindow::StatusWindow():
Window(player_node ? player_node->getName() :
"?", false, nullptr, "status.xml")
{
- listen(Mana::CHANNEL_ATTRIBUTES);
+ listen(CHANNEL_ATTRIBUTES);
setWindowName("Status");
setupWindow->registerWindowForReset(this);
@@ -277,14 +277,14 @@ StatusWindow::StatusWindow():
mLvlLabel->adjustSize();
}
-void StatusWindow::processEvent(Mana::Channels channel A_UNUSED,
- const Mana::Event &event)
+void StatusWindow::processEvent(Channels channel A_UNUSED,
+ const Event &event)
{
static bool blocked = false;
if (blocked)
return;
- if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
+ if (event.getName() == EVENT_UPDATEATTRIBUTE)
{
switch (event.getInt("id"))
{
@@ -343,7 +343,7 @@ void StatusWindow::processEvent(Mana::Channels channel A_UNUSED,
break;
}
}
- else if (event.getName() == Mana::EVENT_UPDATESTAT)
+ else if (event.getName() == EVENT_UPDATESTAT)
{
int id = event.getInt("id");
if (id == Net::getPlayerHandler()->getJobLocation())
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 8e110a354..7f6bd2d18 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -44,7 +44,7 @@ class VertContainer;
*/
class StatusWindow : public Window,
public gcn::ActionListener,
- public Mana::Listener
+ public Listener
{
public:
/**
@@ -52,7 +52,7 @@ class StatusWindow : public Window,
*/
StatusWindow();
- void processEvent(Mana::Channels channel, const Mana::Event &event);
+ void processEvent(Channels channel, const Event &event);
void setPointsNeeded(int id, int needed);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 04:28:59 +0000