[Wesnoth-cvs-commits] wesnoth/src filesystem.cpp game.cpp sdl_utils.cpp

[Pauli Manninen]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Pauli Manninen <address@hidden> 04/10/14 09:27:22

Modified files:
        src            : filesystem.cpp game.cpp sdl_utils.cpp 

Log message:
        dos2unix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.146&tr2=1.147&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sdl_utils.cpp.diff?tr1=1.59&tr2=1.60&r1=text&r2=text

Patches:
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.46 wesnoth/src/filesystem.cpp:1.47
--- wesnoth/src/filesystem.cpp:1.46     Thu Oct  7 01:47:33 2004
+++ wesnoth/src/filesystem.cpp  Thu Oct 14 09:27:22 2004
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.46 2004/10/07 01:47:33 Sirp Exp $ */
+/* $Id: filesystem.cpp,v 1.47 2004/10/14 09:27:22 gakusho Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -184,10 +184,10 @@
 }
 
 std::string get_intl_dir()
-{
-#ifdef _WIN32
+{
+#ifdef _WIN32
        return get_cwd() + "/po";
-#endif
+#endif
 
 #ifdef __APPLE__
        return get_cwd() + "/messages";
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.146 wesnoth/src/game.cpp:1.147
--- wesnoth/src/game.cpp:1.146  Sat Oct  9 21:14:47 2004
+++ wesnoth/src/game.cpp        Thu Oct 14 09:27:22 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.146 2004/10/09 21:14:47 Sirp Exp $ */
+/* $Id: game.cpp,v 1.147 2004/10/14 09:27:22 gakusho Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -420,8 +420,8 @@
                } else if(val == "--debug" || val == "-d") {
                        game_config::debug = true;
                } else if (val.substr(0, 6) == "--log-") {
-               } else if(val == "--nosound") {
-                       //handled elsewhere
+               } else if(val == "--nosound") {
+                       //handled elsewhere
                } else if(val[0] == '-') {
                        std::cerr << "unknown option: " << val << "\n";
                        throw config::error("unknown option");
@@ -467,8 +467,8 @@
                video_.make_fake();
                return true;
        }
-
-    image::set_wm_icon();
+
+    image::set_wm_icon();
 
        int video_flags = preferences::fullscreen() ? FULL_SCREEN : 0;
 
@@ -1401,37 +1401,37 @@
        }
 
        srand(time(NULL));
-
-       game_controller game(argc,argv,use_sound);
 
-       bool res;
+       game_controller game(argc,argv,use_sound);
+
+       bool res;
 #ifdef WIN32
-       res = game.init_config();
-       if(res == false) {
-               std::cerr << "could not initialize game config\n";
-               return 0;
+       res = game.init_config();
+       if(res == false) {
+               std::cerr << "could not initialize game config\n";
+               return 0;
        }
 #endif
 
        res = game.init_video();
-       if(res == false) {
+       if(res == false) {
                std::cerr << "could not initialize display\n";
                return 0;
-       }
-
-       res = game.init_language();
-       if(res == false) {
-               std::cerr << "could not initialize the language\n";
-               return 0;
+       }
+
+       res = game.init_language();
+       if(res == false) {
+               std::cerr << "could not initialize the language\n";
+               return 0;
        }
 
 #ifndef WIN32
        // it is better for gettext-native platforms to read the config
        // files after having pre-initialized the language, maybe...
-       res = game.init_config();
-       if(res == false) {
-               std::cerr << "could not initialize game config\n";
-               return 0;
+       res = game.init_config();
+       if(res == false) {
+               std::cerr << "could not initialize game config\n";
+               return 0;
        }
 #endif
 
Index: wesnoth/src/sdl_utils.cpp
diff -u wesnoth/src/sdl_utils.cpp:1.59 wesnoth/src/sdl_utils.cpp:1.60
--- wesnoth/src/sdl_utils.cpp:1.59      Thu Oct  7 01:47:34 2004
+++ wesnoth/src/sdl_utils.cpp   Thu Oct 14 09:27:22 2004
@@ -1,4 +1,4 @@
-/* $Id: sdl_utils.cpp,v 1.59 2004/10/07 01:47:34 Sirp Exp $ */
+/* $Id: sdl_utils.cpp,v 1.60 2004/10/14 09:27:22 gakusho Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -81,8 +81,8 @@
        surface const result = display_format_alpha(surf);
        if(result == surf) {
                std::cerr << "resulting surface is the same as the source!!!\n";
-       } else if(result == NULL) {
-               return surf;
+       } else if(result == NULL) {
+               return surf;
        }
 
        SDL_SetAlpha(result,SDL_SRCALPHA|SDL_RLEACCEL,SDL_ALPHA_OPAQUE);