[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.151,1.152 blitter.cxx,1.28,1.29 client.cxx,1.45,1.46 col_map.cxx,1.18,1.19 config.cxx,1.15,1.16 credits.cxx,1.34,1.35 demo_recorder.cxx,1.18,1.19 exit_menu.cxx,1.19,1.20 fps_counter.cxx,1.7,1.8 game_time.cxx,1.9,1.10 level_desc.cxx,1.12,1.13 level_result.cxx,1.15,1.16 menu_button.cxx,1.10,1.11 pingu.cxx,1.42,1.43 pingu_enums.cxx,1.7,1.8 pingus_counter.cxx,1.15,1.16 pingus_error.cxx,1.9,1.10 pingus_main.cxx,1.89,1.90 result_screen.cxx,1.16,1.17 screenshot.cxx,1.13,1.14 spot_map.cxx,1.26,1.27 start_screen.cxx,1.19,1.20 story.cxx,1.28,1.29 story_screen.cxx,1.19,1.20 system.cxx,1.19,1.20my_gettext.hxx,1.5,NONE

[grumbel]

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

Modified Files:
        Makefile.am blitter.cxx client.cxx col_map.cxx config.cxx 
        credits.cxx demo_recorder.cxx exit_menu.cxx fps_counter.cxx 
        game_time.cxx level_desc.cxx level_result.cxx menu_button.cxx 
        pingu.cxx pingu_enums.cxx pingus_counter.cxx pingus_error.cxx 
        pingus_main.cxx result_screen.cxx screenshot.cxx spot_map.cxx 
        start_screen.cxx story.cxx story_screen.cxx system.cxx 
Removed Files:
        my_gettext.hxx 
Log Message:
- added win32 gettext fixes
- replaced my_gettext.hxx by gettext.h

Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.am,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- Makefile.am 16 Apr 2003 18:02:27 -0000      1.151
+++ Makefile.am 24 Apr 2003 15:18:19 -0000      1.152
@@ -179,7 +179,6 @@
 mover.hxx \
 multiline_text.cxx \
 multiline_text.hxx \
-my_gettext.hxx \
 path_manager.cxx \
 path_manager.hxx \
 pingu.cxx \

Index: blitter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- blitter.cxx 19 Apr 2003 10:23:17 -0000      1.28
+++ blitter.cxx 24 Apr 2003 15:18:19 -0000      1.29
@@ -30,7 +30,7 @@
 #include "blitter_impl.hxx"
 
 /* Headers needed for i18n / gettext */
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 #define COMPILE_WITH_MEMORY_HOLE 0
 

Index: client.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/client.cxx,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- client.cxx  19 Apr 2003 10:23:17 -0000      1.45
+++ client.cxx  24 Apr 2003 15:18:19 -0000      1.46
@@ -152,7 +152,7 @@
 void
 Client::process_scroll_event (const Input::ScrollEvent& ev)
 {
-  std::cout << "Client::process_scroll_event ()" << std::endl;
+  //std::cout << "Client::process_scroll_event ()" << std::endl;
   playfield->scroll(static_cast<int>(ev.x_delta),
                     static_cast<int>(ev.y_delta));
 }

Index: col_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- col_map.cxx 19 Apr 2003 10:23:17 -0000      1.18
+++ col_map.cxx 24 Apr 2003 15:18:19 -0000      1.19
@@ -23,7 +23,7 @@
 #include "gui/graphic_context.hxx"
 #include "globals.hxx"
 #include "col_map.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 #define COLMAP_WITH_MEMORY_HOLE 1
 

Index: config.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/config.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- config.cxx  19 Apr 2003 10:23:17 -0000      1.15
+++ config.cxx  24 Apr 2003 15:18:19 -0000      1.16
@@ -25,7 +25,7 @@
 #include "config.hxx"
 #include "system.hxx"
 #include "cheat.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 struct ConfigParserEOF {};
 

Index: credits.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/credits.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- credits.cxx 23 Apr 2003 16:16:37 -0000      1.34
+++ credits.cxx 24 Apr 2003 15:18:19 -0000      1.35
@@ -25,7 +25,7 @@
 #include "pingus_resource.hxx"
 #include "credits.hxx"
 #include "fonts.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 Credits* Credits::instance_ = 0;
 

Index: demo_recorder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/demo_recorder.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- demo_recorder.cxx   19 Apr 2003 10:23:17 -0000      1.18
+++ demo_recorder.cxx   24 Apr 2003 15:18:19 -0000      1.19
@@ -24,7 +24,7 @@
 #include "demo_recorder.hxx"
 #include "server.hxx"
 #include "plf.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 DemoRecorder::DemoRecorder (Server* server)
   : record_demo (true)

Index: exit_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/exit_menu.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- exit_menu.cxx       19 Apr 2003 10:23:17 -0000      1.19
+++ exit_menu.cxx       24 Apr 2003 15:18:19 -0000      1.20
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Display/Display/display.h>
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "pingus_menu_manager.hxx"
 #include "pingus_resource.hxx"
 #include "gui/surface_button.hxx"

Index: fps_counter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/fps_counter.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fps_counter.cxx     22 Apr 2003 16:40:41 -0000      1.7
+++ fps_counter.cxx     24 Apr 2003 15:18:19 -0000      1.8
@@ -23,7 +23,7 @@
 #include <ClanLib/Display/Font/font.h>
 #include "fonts.hxx"
 #include "fps_counter.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 FPSCounter fps_counter;
 

Index: game_time.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/game_time.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- game_time.cxx       19 Apr 2003 10:23:17 -0000      1.9
+++ game_time.cxx       24 Apr 2003 15:18:19 -0000      1.10
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "globals.hxx"
 #include "game_time.hxx"
 

Index: level_desc.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_desc.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- level_desc.cxx      22 Apr 2003 16:40:41 -0000      1.12
+++ level_desc.cxx      24 Apr 2003 15:18:19 -0000      1.13
@@ -26,7 +26,7 @@
 #include "fonts.hxx"
 #include "system.hxx"
 #include "plf.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 PingusLevelDesc::PingusLevelDesc(PLF* arg_plf)
 {

Index: level_result.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_result.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- level_result.cxx    22 Apr 2003 16:40:41 -0000      1.15
+++ level_result.cxx    24 Apr 2003 15:18:19 -0000      1.16
@@ -30,7 +30,7 @@
 #include "world.hxx"
 #include "pingu_holder.hxx"
 #include "fonts.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 PingusLevelResult::PingusLevelResult(World* w, Controller* c)
   : controller (c)

Index: menu_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- menu_button.cxx     22 Apr 2003 16:40:41 -0000      1.10
+++ menu_button.cxx     24 Apr 2003 15:18:19 -0000      1.11
@@ -31,7 +31,7 @@
 #include "gui/screen_manager.hxx"
 #include "worldmap/manager.hxx"
 #include "story_screen.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "stat_manager.hxx"
 #include "story.hxx"
 

Index: pingu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingu.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- pingu.cxx   19 Apr 2003 10:23:17 -0000      1.42
+++ pingu.cxx   24 Apr 2003 15:18:19 -0000      1.43
@@ -26,7 +26,7 @@
 #include "col_map.hxx"
 #include "pingu_action.hxx"
 #include "pingu_action_factory.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "debug.hxx"
 #include "worldobj.hxx"
 #include "fonts.hxx"

Index: pingu_enums.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingu_enums.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingu_enums.cxx     19 Apr 2003 10:23:17 -0000      1.7
+++ pingu_enums.cxx     24 Apr 2003 15:18:19 -0000      1.8
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "pingu_enums.hxx"
 
 // Pingu "globals".  Make [deadly_velocity = 20 * sqrt("normal gravity")] so

Index: pingus_counter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_counter.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pingus_counter.cxx  22 Apr 2003 16:40:41 -0000      1.15
+++ pingus_counter.cxx  24 Apr 2003 15:18:19 -0000      1.16
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "pingus_resource.hxx"
 #include "pingus_counter.hxx"
 #include "world.hxx"

Index: pingus_error.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_error.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pingus_error.cxx    19 Apr 2003 10:23:17 -0000      1.9
+++ pingus_error.cxx    24 Apr 2003 15:18:19 -0000      1.10
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "pingus_error.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 PingusException::PingusException (const std::string& mes) : message(mes)
 {

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- pingus_main.cxx     24 Apr 2003 13:18:18 -0000      1.89
+++ pingus_main.cxx     24 Apr 2003 15:18:19 -0000      1.90
@@ -45,7 +45,7 @@
 # include <ClanLib/gl.h>
 #endif
 
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 #include "gui/screen_manager.hxx"
 #include "gui/input_debug_screen.hxx"
@@ -680,7 +680,12 @@
         std::cout << "setlocale returned '" << ret << "'" << std::endl;
     }
 
-  bindtextdomain(PACKAGE, (path_manager.get_base_path () + 
"/../../locale/").c_str());
+#ifdef WIN32
+  bindtextdomain(PACKAGE, path_manager.complete("/../../locale/").c_str());
+#else
+  bindtextdomain(PACKAGE, path_manager.complete("locale/").c_str());
+#endif
+
   // We use another LOCALEDIR to make static binaries possible
   // bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain(PACKAGE);
@@ -688,8 +693,8 @@
   // Forcing codeset to ISO-8859-1, since usage of
   // setlocate(LC_CTYPE,"") causes all sorts of throuble
   bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
-
 #endif
+
   if (maintainer_mode)
     std::cout << "BasePath: " << path_manager.get_base_path () << std::endl;
 }

Index: result_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/result_screen.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- result_screen.cxx   23 Apr 2003 16:16:37 -0000      1.16
+++ result_screen.cxx   24 Apr 2003 15:18:19 -0000      1.17
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "sprite.hxx"
 #include "gui/surface_button.hxx"
 #include "gui/gui_manager.hxx"

Index: screenshot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/screenshot.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- screenshot.cxx      23 Apr 2003 16:16:37 -0000      1.13
+++ screenshot.cxx      24 Apr 2003 15:18:19 -0000      1.14
@@ -27,7 +27,7 @@
 #include <ClanLib/Display/Display/target.h>
 #include "system.hxx"
 #include "screenshot.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 // Saves a screenshot to file, it return the filename the screenshot
 // was saved to.

Index: spot_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/spot_map.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- spot_map.cxx        19 Apr 2003 10:23:17 -0000      1.26
+++ spot_map.cxx        24 Apr 2003 15:18:19 -0000      1.27
@@ -24,7 +24,7 @@
 #include "pingus_error.hxx"
 #include "blitter.hxx"
 #include "spot_map.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "col_map.hxx"
 #include "math.hxx"
 

Index: start_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/start_screen.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- start_screen.cxx    19 Apr 2003 10:23:17 -0000      1.19
+++ start_screen.cxx    24 Apr 2003 15:18:19 -0000      1.20
@@ -23,7 +23,7 @@
 #include "gui/surface_button.hxx"
 #include "gui/component.hxx"
 #include "gui/screen_manager.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "game_session.hxx"
 #include "globals.hxx"
 #include "string_converter.hxx"
@@ -141,7 +141,7 @@
 
   int left_x  = CL_Display::get_width()/2 - 120;
   int right_x = CL_Display::get_width()/2 + 120;
-  int y = CL_Display::get_height()/2 + 10;
+  int y = CL_Display::get_height()/2 + 40;
 
   gc.print_center(Fonts::chalk_large,
                   gc.get_width()/2,

Index: story.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- story.cxx   23 Apr 2003 16:16:37 -0000      1.28
+++ story.cxx   24 Apr 2003 15:18:19 -0000      1.29
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <algorithm>
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "story.hxx"
 #include "string_format.hxx"
 #include "fonts.hxx"

Index: story_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story_screen.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- story_screen.cxx    19 Apr 2003 10:23:17 -0000      1.19
+++ story_screen.cxx    24 Apr 2003 15:18:19 -0000      1.20
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <vector>
 #include <ClanLib/Display/Display/surface.h>
-#include "my_gettext.hxx"
+#include "gettext.h"
 #include "pingus_resource.hxx"
 #include "gui/gui_manager.hxx"
 #include "gui/surface_button.hxx"

Index: system.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/system.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- system.cxx  19 Apr 2003 10:23:17 -0000      1.19
+++ system.cxx  24 Apr 2003 15:18:19 -0000      1.20
@@ -39,7 +39,7 @@
 #include "globals.hxx"
 #include "string_converter.hxx"
 #include "system.hxx"
-#include "my_gettext.hxx"
+#include "gettext.h"
 
 int System::verbose;
 std::string System::default_email;

--- my_gettext.hxx DELETED ---