diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-25 19:35:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-25 19:35:14 +0300 |
commit | 6317f3e0c1e2c6d2e88dd99443e7f45f7bb77f44 (patch) | |
tree | e7952bc33830b240974c54396423b980ee078214 | |
parent | 3884c9d240a6dd7e3821f1ed9cb18a28a228b93e (diff) | |
download | mv-6317f3e0c1e2c6d2e88dd99443e7f45f7bb77f44.tar.gz mv-6317f3e0c1e2c6d2e88dd99443e7f45f7bb77f44.tar.bz2 mv-6317f3e0c1e2c6d2e88dd99443e7f45f7bb77f44.tar.xz mv-6317f3e0c1e2c6d2e88dd99443e7f45f7bb77f44.zip |
Fix code style.
-rw-r--r-- | src/guichan/include/guichan/sdl/sdlpixel.hpp | 3 | ||||
-rw-r--r-- | src/logger.cpp | 3 | ||||
-rw-r--r-- | src/net/manaserv/network.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp index bfd08341b..f56100b4a 100644 --- a/src/guichan/include/guichan/sdl/sdlpixel.hpp +++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp @@ -124,7 +124,8 @@ namespace gcn SDL_LockSurface(surface); - Uint8 *p = static_cast<Uint8*>(surface->pixels) + y * surface->pitch + x * bpp; + Uint8 *p = static_cast<Uint8*>(surface->pixels) + + y * surface->pitch + x * bpp; Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); diff --git a/src/logger.cpp b/src/logger.cpp index 3c439136b..9c9c6efef 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -234,7 +234,8 @@ void Logger::error(const std::string &error_text) // (ConstStr255Param) msg, nullptr, nullptr); #elif defined __linux__ || __linux std::cerr << "Error: " << error_text << std::endl; - std::string msg = "xmessage \"Error happend. Please see log file for more information.\""; + std::string msg = "xmessage \"Error happend. " + "Please see log file for more information.\""; if (system(msg.c_str()) == -1) std::cerr << "Error: " << error_text << std::endl; #else diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp index a75da3643..05041c56a 100644 --- a/src/net/manaserv/network.cpp +++ b/src/net/manaserv/network.cpp @@ -76,8 +76,8 @@ void finalize() if (connections) { - logger->safeError("Tried to shutdown the network subsystem while there " - "are network connections left!"); + logger->safeError("Tried to shutdown the network subsystem " + "while there are network connections left!"); } clearNetworkHandlers(); |