[Wesnoth-cvs-commits] wesnoth/src game.cpp multiplayer_lobby.cpp serv...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/09/18 19:08:31

Modified files:
        src            : game.cpp multiplayer_lobby.cpp 
        src/server     : server.cpp 

Log message:
        codeclean

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.280&tr2=1.281&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/server.cpp.diff?tr1=1.88&tr2=1.89&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.280 wesnoth/src/game.cpp:1.281
--- wesnoth/src/game.cpp:1.280  Sun Sep 18 16:52:47 2005
+++ wesnoth/src/game.cpp        Sun Sep 18 19:08:25 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.280 2005/09/18 16:52:47 Sirp Exp $ */
+/* $Id: game.cpp,v 1.281 2005/09/18 19:08:25 ott Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1074,7 +1074,7 @@
 
        std::cerr << "uploading campaign...\n";
        network::send_data(data,sock);
-
+
        sock = gui::network_data_dialog(disp(),_("Awaiting response from 
server"),data,sock);
        if(!sock) {
                gui::show_error_message(disp(), _("Connection timed out"));
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.91 
wesnoth/src/multiplayer_lobby.cpp:1.92
--- wesnoth/src/multiplayer_lobby.cpp:1.91      Sat Sep 17 20:16:38 2005
+++ wesnoth/src/multiplayer_lobby.cpp   Sun Sep 18 19:08:27 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.91 2005/09/17 20:16:38 j_daniel Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.92 2005/09/18 19:08:27 ott Exp $ */
 /*
    Copyright (C)
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -124,9 +124,9 @@
 
 
        // draw gold icon
-       const surface gold_icon(image::get_image(gold_icon_locator_, 
image::UNSCALED)); 
+       const surface gold_icon(image::get_image(gold_icon_locator_, 
image::UNSCALED));
        ypos = item_rect.y + item_rect.h  - margin_ - gold_icon->h;
-       
+
        video().blit_surface(xpos, ypos, gold_icon);
 
        xpos += gold_icon->w + h_padding_;
@@ -166,7 +166,7 @@
        // draw status text
        xpos = item_rect.x + item_rect.w - margin_ - status_text->w;
        video().blit_surface(xpos, ypos, status_text);
-       
+
        if(selected_ == index)
                draw_solid_tinted_rectangle(item_rect.x, item_rect.y, 
item_rect.w, item_rect.h, 153, 0, 0, 0.3, video().getSurface());
 }
Index: wesnoth/src/server/server.cpp
diff -u wesnoth/src/server/server.cpp:1.88 wesnoth/src/server/server.cpp:1.89
--- wesnoth/src/server/server.cpp:1.88  Sat Sep 17 23:30:27 2005
+++ wesnoth/src/server/server.cpp       Sun Sep 18 19:08:31 2005
@@ -1,4 +1,4 @@
-/* $Id: server.cpp,v 1.88 2005/09/17 23:30:27 Sirp Exp $ */
+/* $Id: server.cpp,v 1.89 2005/09/18 19:08:31 ott Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -14,7 +14,7 @@
 #include "../global.hpp"
 
 #include "../config.hpp"
-#include "../game_config.hpp"
+#include "../game_config.hpp"
 #include "../log.hpp"
 #include "../network.hpp"
 #include "../util.hpp"
@@ -993,7 +993,7 @@
 
 int main(int argc, char** argv)
 {
-       int port = 15000;
+       int port = 15000;
        size_t nthreads = 5;
 
        network::set_default_send_size(4096);
@@ -1026,8 +1026,8 @@
                        }
                } else if((val == "--max_packet_size" || val == "-m") && arg+1 
!= argc) {
                        
network::set_default_send_size(size_t(atoi(argv[++arg])));
-               } else if(val == "--verbose" || val == "-v") {
-                       lg::set_log_domain_severity("all",2);
+               } else if(val == "--verbose" || val == "-v") {
+                       lg::set_log_domain_severity("all",2);
                } else if((val == "--port" || val == "-p") && arg+1 != argc) {
                        port = atoi(argv[++arg]);
                } else if(val == "--help" || val == "-h") {
@@ -1036,7 +1036,7 @@
                                << "  -d  --daemon               Runs wesnothd 
as a daemon\n"
                                << "  -m, --max_packet_size n    Sets the 
maximal packet size to n\n"
                                << "  -p, --port                 Binds the 
server to the specified port\n"
-                               << "  -v, --version              Returns the 
server version\n"
+                               << "  -v, --version              Returns the 
server version\n"
                                << "  -t, --threads n            Uses n worker 
threads for network I/O (default: 5)\n";
                        return 0;
                } else if(val == "--version" || val == "-v") {
@@ -1059,11 +1059,11 @@
 
                        setsid();
 #endif
-               } else if((val == "--threads" || val == "-t") && arg+1 != argc) 
{
-                       nthreads = atoi(argv[++arg]);
-                       if(nthreads > 30) {
-                               nthreads = 30;
-                       }
+               } else if((val == "--threads" || val == "-t") && arg+1 != argc) 
{
+                       nthreads = atoi(argv[++arg]);
+                       if(nthreads > 30) {
+                               nthreads = 30;
+                       }
                } else if(val[0] == '-') {
                        std::cerr << "unknown option: " << val << "\n";
                        return 0;