summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/graphicsmanager.cpp2
-rw-r--r--src/gui/chatwindow.cpp3
-rw-r--r--src/soundmanager.cpp9
-rw-r--r--src/touchmanager.h2
4 files changed, 10 insertions, 6 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index cb7c401c6..93c11346f 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -302,7 +302,7 @@ void GraphicsManager::setVideoMode()
logger->log("Current resolution %s is incorrect.",
str.c_str());
}
- str = videoModes[0];
+// str = videoModes[0];
std::vector<int> res;
splitToIntVector(res, videoModes[0], 'x');
if (res.size() == 2)
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 638d7f81c..960554be1 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -1420,7 +1420,8 @@ void ChatWindow::resortChatLog(std::string line, Own own,
if (line.find(": \302\202\302") != std::string::npos)
return;
line = line.erase(idx + 2, 2);
- tradeChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors);
+ tradeChatTab->chatLog(line, own, ignoreRecord,
+ tryRemoveColors);
return;
}
}
diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp
index 9a3bc3185..d1a6a5d74 100644
--- a/src/soundmanager.cpp
+++ b/src/soundmanager.cpp
@@ -105,7 +105,8 @@ void SoundManager::init()
if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1)
{
- logger->log1("SoundManager::init() Failed to initialize audio subsystem");
+ logger->log1("SoundManager::init() Failed to "
+ "initialize audio subsystem");
return;
}
@@ -277,7 +278,8 @@ void SoundManager::fadeOutMusic(const int ms)
}
}
-void SoundManager::fadeOutAndPlayMusic(const std::string &fileName, const int ms)
+void SoundManager::fadeOutAndPlayMusic(const std::string &fileName,
+ const int ms)
{
mNextMusicFile = fileName;
fadeOutMusic(ms);
@@ -304,7 +306,8 @@ void SoundManager::logic()
BLOCK_END("SoundManager::logic")
}
-void SoundManager::playSfx(const std::string &path, const int x, const int y) const
+void SoundManager::playSfx(const std::string &path,
+ const int x, const int y) const
{
if (!mInstalled || path.empty() || !mPlayBattle)
return;
diff --git a/src/touchmanager.h b/src/touchmanager.h
index f54520cf7..fb81a0beb 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -94,7 +94,7 @@ class TouchManager final
{
NORMAL = 0,
LEFT = 1,
- RIGHT = 2,
+ RIGHT = 2
};
void init();