[Pingus-CVS] CVS: Games/Pingus/src color.cxx,NONE,1.1 Makefile.am,1.147,1.148 color.hxx,1.5,1.6 pingus_main.cxx,1.73,1.74pingus_resource.cxx,1.26,1.27

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv24025/src

Modified Files:
        Makefile.am color.hxx pingus_main.cxx pingus_resource.cxx 
Added Files:
        color.cxx 
Log Message:
setlocale bug, added operator<< for color

--- NEW FILE: color.cxx ---
//  $Id: color.cxx,v 1.1 2003/04/11 16:51:15 grumbel Exp $
//
//  Pingus - A free Lemmings clone
//  Copyright (C) 2002 Ingo Ruhnke <address@hidden>
//
//  This program is free software; you can redistribute it and/or
//  modify it under the terms of the GNU General Public License
//  as published by the Free Software Foundation; either version 2
//  of the License, or (at your option) any later version.
//
//  This program is distributed in the hope that it will be useful,
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//  GNU General Public License for more details.
//
//  You should have received a copy of the GNU General Public License
//  along with this program; if not, write to the Free Software
//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

#include "color.hxx"

std::ostream& operator<<(std::ostream& s, const Color& color)
{
  s << "[RGBA: " 
    << color.red << ", "
    << color.green << ", "
    << color.blue << ", "
    << color.alpha << "]";
}

/* EOF */

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- Makefile.am 11 Apr 2003 14:30:05 -0000      1.147
+++ Makefile.am 11 Apr 2003 16:51:15 -0000      1.148
@@ -97,6 +97,7 @@
 col_map.cxx \
 col_map.hxx \
 color.hxx \
+color.cxx \
 config.cxx \
 config.hxx \
 config_xml.cxx \

Index: color.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/color.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- color.hxx   27 Sep 2002 11:26:43 -0000      1.5
+++ color.hxx   11 Apr 2003 16:51:15 -0000      1.6
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_COLOR_HXX
 
 #include "pingus.hxx"
+#include <iostream>
 
 class Color
 {
@@ -64,6 +65,8 @@
   }
   
 };
+
+std::ostream& operator<<(std::ostream& s, const Color& color);
 
 #endif
 

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- pingus_main.cxx     11 Apr 2003 14:30:05 -0000      1.73
+++ pingus_main.cxx     11 Apr 2003 16:51:15 -0000      1.74
@@ -615,7 +615,7 @@
 #ifdef HAVE_GETTEXT
   if (maintainer_mode)
     std::cout << "Setting gettext path to: " << path_manager.get_base_path () 
+ "/../../locale" << std::endl;
-  const char* ret = setlocale (LC_ALL, "");
+  const char* ret = setlocale (LC_MESSAGES, "");
   if (ret == NULL)
     {
       std::cout << "ERROR: setlocale failed!" <<  std::endl;

Index: pingus_resource.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_resource.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- pingus_resource.cxx 2 Apr 2003 19:59:04 -0000       1.26
+++ pingus_resource.cxx 11 Apr 2003 16:51:15 -0000      1.27
@@ -193,6 +193,8 @@
 CL_Surface
 PingusResource::load_from_source (const ResDescriptor& res_desc)
 {
+  //std::cout << "RESDUMP: " << res_desc << std::endl;
+
   switch(res_desc.type)
     {
     case ResDescriptor::RD_RESOURCE: