[Pingus-CVS] [pingus] push by address@hidden - Unified license text, changed version to 0.7.4, removed " - SDL Editio... on 2011-09-28 14:40 GMT

[pingus]

Revision: 64b1c51e542d
Author:   Ingo Ruhnke <address@hidden>
Date:     Wed Sep 28 07:40:21 2011
Log:      Unified license text, changed version to 0.7.4, removed " - SDL  
Edition"

http://code.google.com/p/pingus/source/detail?r=64b1c51e542d

Modified:
 /SConscript
 /src/engine/system/sdl_system.cpp
 /src/pingus/pingus_main.cpp
 /src/pingus/screens/pingus_menu.cpp

=======================================
--- /SConscript Sun Sep 18 05:04:33 2011
+++ /SConscript Wed Sep 28 07:40:21 2011
@@ -107,7 +107,7 @@

         self.env = Environment(options = self.opts, ENV=os.environ)
         self.env.Append(CXXFLAGS = ["-std=c++0x"])
-        self.env.Append(CPPDEFINES = [('VERSION', '"\\"0.8.0\\""')])
+        self.env.Append(CPPDEFINES = [('VERSION', '"\\"0.7.4\\""')])
         Help(self.opts.GenerateHelpText(self.env))

         if os.environ.has_key('PATH'):
=======================================
--- /src/engine/system/sdl_system.cpp   Sun Sep 11 09:35:41 2011
+++ /src/engine/system/sdl_system.cpp   Wed Sep 28 07:40:21 2011
@@ -42,7 +42,7 @@
 {
   Display::set_video_mode(size, fullscreen);

-  SDL_WM_SetCaption("Pingus " VERSION " - SDL Edition", 0 /* icon */);
+  SDL_WM_SetCaption("Pingus " VERSION, 0 /* icon */);

   SDL_EnableUNICODE(1);

=======================================
--- /src/pingus/pingus_main.cpp Tue Sep 20 10:03:16 2011
+++ /src/pingus/pingus_main.cpp Wed Sep 28 07:40:21 2011
@@ -333,13 +333,13 @@
         break;

       case 'v':
-        std::cout << "Pingus " << VERSION << std::endl;
-        std::cout << "\n"
+        std::cout <<
+          "Pingus " VERSION "\n"
           "Copyright (C) 1998-2011 Ingo Ruhnke <address@hidden>\n"
-          "See the file AUTHORS for a complete list of contributors.\n\n"
-          "There is NO warranty.  You may redistribute this software\n"
-          "under the terms of the GNU General Public License.\n"
-          "For more information about these matters, see the files named  
COPYING." << std::endl;
+          "See the file AUTHORS for a complete list of contributors.\n"
+          "Pingus comes with ABSOLUTELY NO WARRANTY. This is free  
software, and you are\n"
+          "welcome to redistribute it under certain conditions; see the  
file COPYING for details."
+                  << std::endl;
         exit(EXIT_SUCCESS);
         break;

=======================================
--- /src/pingus/screens/pingus_menu.cpp Wed Aug 31 05:04:36 2011
+++ /src/pingus/screens/pingus_menu.cpp Wed Sep 28 07:40:21 2011
@@ -146,7 +146,7 @@
                          gc.get_height()/2 - 250));

   gc.print_left(Fonts::pingus_small, Vector2i(25, gc.get_height()-140),
-                "Pingus "VERSION", Copyright (C) 1998-2011 Ingo Ruhnke  
<address@hidden>\n"
+                "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke  
<address@hidden>\n"
                 "See the file AUTHORS for a complete list of  
contributors.\n"
                 "Pingus comes with ABSOLUTELY NO WARRANTY. This is free  
software, and you are\n"
                 "welcome to redistribute it under certain conditions; see  
the file COPYING for details.\n");