summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/characterviewnormal.cpp1
-rw-r--r--src/gui/windows/chatwindow.cpp4
-rw-r--r--src/gui/windows/chatwindow.h2
-rw-r--r--src/gui/windows/tradewindow.h2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index 97f195682..a4b9271e3 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -61,7 +61,6 @@ CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
{
mSelected = -1;
}
-
}
setHeight(210 + config.getIntValue("fontSize") * 2);
}
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index bcf72a0a1..9190f44f0 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1526,7 +1526,7 @@ bool ChatWindow::resortChatLog(std::string line,
{
const std::string nick = line.substr(0, idx2 - 1);
line = line.substr(idx2 + 6);
- localPetDirection(nick, static_cast<BeingDirection::Type>(
+ localPetDirection(nick, static_cast<uint8_t>(
atoi(line.c_str())));
}
else if (line.find(": \302\202\302a") != std::string::npos)
@@ -1714,7 +1714,7 @@ void ChatWindow::localPetMove(const std::string &nick,
}
void ChatWindow::localPetDirection(const std::string &nick,
- BeingDirection::Type dir)
+ uint8_t dir)
{
Being *const pet = getPetForNick(nick);
if (pet)
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 40f0a4a77..5644d7d3c 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -303,7 +303,7 @@ class ChatWindow final : public Window,
const int x, const int y);
static void localPetDirection(const std::string &nick,
- BeingDirection::Type dir);
+ uint8_t dir);
static void localPetAi(const std::string &nick,
const bool start);
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index 92f332296..f5b17eddd 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -86,7 +86,7 @@ class TradeWindow final : public Window,
* Add an item to the trade window.
*/
void addItem2(const int id,
- const int type,
+ const int type,
const int *const cards,
const int sz,
const bool own,