super-tux-commit

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12639/src

Modified Files:
	leveleditor.cpp sector.cpp supertux.cpp timer.h 
Log Message:
Goodbye gettext, Welcome TinyGetText

Index: timer.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/timer.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- timer.h	20 Nov 2004 22:14:39 -0000	1.17
+++ timer.h	23 Nov 2004 22:22:14 -0000	1.18
@@ -17,7 +17,7 @@
    * Set period to zero if you want to disable the timer.
    */
   void start(float period, bool cyclic = false);
-  /** returns true if a period (or more) passed during the last tick command */
+  /** returns true if a period (or more) passed */
   bool check();
 
   /** returns the period of the timer or 0 if it isn't started */

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- leveleditor.cpp	23 Nov 2004 16:47:25 -0000	1.169
+++ leveleditor.cpp	23 Nov 2004 22:21:51 -0000	1.170
@@ -935,7 +935,7 @@
 
 
 char str[1024];
-char *text1[] = {
+const char *text1[] = {
          _("This is the built-in level editor. Its aim is to be intuitive\n"
          "and simple to use, so it should be pretty straightforward.\n"
          "\n"
@@ -971,7 +971,7 @@
          "enemies and game objects in the bottom.\n")
                 };
 
-char *text2[] = {
+const char *text2[] = {
          _("The Foreground/Interactive/Background buttons may be used to\n"
          "see and edit the respective layer. Levels have three tiles layers:\n"
          "Foreground - tiles are drawn on top of everything and have no contact\n"
@@ -1004,7 +1004,7 @@
          "Webpage: http://pingus.seul.org/~grumbel/flexlay/")
                 };
 
-char **text[] = { text1, text2 };
+const char **text[] = { text1, text2 };
 
 
 bool done;

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- supertux.cpp	23 Nov 2004 15:34:45 -0000	1.31
+++ supertux.cpp	23 Nov 2004 22:22:14 -0000	1.32
@@ -49,18 +49,9 @@
   try {
 #endif
     config = new MyConfig;
+   
+    Setup::init(PACKAGE_NAME, PACKAGE, PACKAGE_VERSION);  
     
-    // we want translations only on messages
-    setlocale(LC_ALL, "C");
-    setlocale(LC_MESSAGES, "");
-    
-    (void) bindtextdomain(PACKAGE, LOCALEDIR);
-    (void) textdomain(PACKAGE);
-    (void) bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
-    
-    Setup::info(PACKAGE_NAME, PACKAGE, PACKAGE_VERSION);  
-    
-    Setup::directories();
     Setup::parseargs(argc, argv);
 
     Setup::audio();

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sector.cpp	23 Nov 2004 22:11:08 -0000	1.41
+++ sector.cpp	23 Nov 2004 22:22:14 -0000	1.42
@@ -162,8 +162,8 @@
       return new FlyingPlatform(reader);
 #endif
 
-   std::cerr << "Unknown object type '" << name << "'.\n";
-   return 0;
+  std::cerr << "Unknown object type '" << name << "'.\n";
+  return 0;
 }
 
 void