[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src globals.cxx, 1.14, 1.15 pingus_main.c
From: |
sphair |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src globals.cxx, 1.14, 1.15 pingus_main.cxx, 1.92, 1.93 system.cxx, 1.20, 1.21 |
Date: |
13 Aug 2003 13:46:41 -0000 |
Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv7747/src
Modified Files:
globals.cxx pingus_main.cxx system.cxx
Log Message:
- Gettext support in Windows
Index: globals.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/globals.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- globals.cxx 19 Apr 2003 10:23:17 -0000 1.14
+++ globals.cxx 13 Aug 2003 13:46:39 -0000 1.15
@@ -34,7 +34,11 @@
bool auto_scrolling = true;
int tile_size = 32;
#ifdef WIN32
+#ifdef _DEBUG
+bool fullscreen_enabled = false;
+#else
bool fullscreen_enabled = true;
+#endif
#else
bool fullscreen_enabled = false;
#endif
Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- pingus_main.cxx 4 Jun 2003 17:22:33 -0000 1.92
+++ pingus_main.cxx 13 Aug 2003 13:46:39 -0000 1.93
@@ -685,7 +685,7 @@
#ifndef WIN32
bindtextdomain(PACKAGE, path_manager.complete("/../../locale/").c_str());
#else
- bindtextdomain(PACKAGE, path_manager.complete("/locale/").c_str());
+ bindtextdomain(PACKAGE, path_manager.complete("../locale/").c_str());
#endif
// We use another LOCALEDIR to make static binaries possible
@@ -851,8 +851,12 @@
//signal(SIGINT, signal_handler);
// Redirect stdout to somewhere where it is readable
- //CL_ConsoleWindow cl_console(PACKAGE VERSION);
- //cl_console.redirect_stdio();
+ #ifdef WIN32
+ #ifdef _DEBUG
+ CL_ConsoleWindow cl_console(PACKAGE VERSION);
+ cl_console.redirect_stdio();
+ #endif
+ #endif
// Init error/warning/notice streams
pout.add (std::cout);
@@ -905,6 +909,13 @@
deinit_pingus();
deinit_clanlib();
+
+ #ifdef WIN32
+ #ifdef _DEBUG
+ cl_console.wait_for_key();
+ #endif
+ #endif
+
return 0;
}
Index: system.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/system.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- system.cxx 24 Apr 2003 15:18:19 -0000 1.20
+++ system.cxx 13 Aug 2003 13:46:39 -0000 1.21
@@ -344,9 +344,11 @@
System::get_language()
{
#ifdef WIN32
- return default_language;
+ char* lang_c = getenv ("LC_MESSAGES");
#else
char* lang_c = setlocale(LC_MESSAGES, NULL);
+#endif
+
std::string lang;
if (lang_c)
@@ -356,7 +358,6 @@
return default_language;
else
return lang.substr(0, 2);
-#endif
}
std::string
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src globals.cxx, 1.14, 1.15 pingus_main.cxx, 1.92, 1.93 system.cxx, 1.20, 1.21,
sphair <=