summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/client.cpp
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadmana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 18d95ac8..1348112d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -252,7 +252,7 @@ Client::Client(const Options &options):
if (!resman->setWriteDir(mLocalDataDir))
{
- logger->error(strprintf("%s couldn't be set as home directory! "
+ logger->error(strprintf("%s couldn't be set as write directory! "
"Exiting.", mLocalDataDir.c_str()));
}
@@ -505,9 +505,6 @@ int Client::exec()
mState = STATE_EXIT;
break;
- case SDL_KEYDOWN:
- break;
-
case SDL_WINDOWEVENT:
switch (event.window.event) {
case SDL_WINDOWEVENT_SIZE_CHANGED:
@@ -663,8 +660,7 @@ int Client::exec()
// lower than the default value
Theme::instance()->setMinimumOpacity(0.8f);
- if (mOptions.username.empty()
- || mOptions.password.empty())
+ if (mOptions.username.empty() || mOptions.password.empty())
{
mCurrentDialog = new LoginDialog(&loginData);
}
@@ -701,7 +697,7 @@ int Client::exec()
}
else
{
- mCurrentDialog = new WorldSelectDialog(worlds);
+ mCurrentDialog = new WorldSelectDialog(std::move(worlds));
if (mOptions.chooseDefault)
{
((WorldSelectDialog*) mCurrentDialog)->action(