From: Tobias Markus <tobbi@mozilla-uk.org>
Date: Tue, 21 May 2013 20:19:27 +0000 (-1000)
Subject: Fixed compiler warnings, see bug962
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=43b41a583ba4dea887becd5fd9bcc4045a42033e;p=supertux.git

Fixed compiler warnings, see bug962
---

diff --git a/external/findlocale/findlocale.c b/external/findlocale/findlocale.c
index 4874ba2e4..e08ca9da1 100644
--- a/external/findlocale/findlocale.c
+++ b/external/findlocale/findlocale.c
@@ -416,7 +416,7 @@ lcid_to_fl(LCID lcid,
 
 
 FL_Success
-FL_FindLocale(FL_Locale **locale, FL_Domain domain) {
+FL_FindLocale(FL_Locale **locale) {
   FL_Success success = FL_FAILED;
   FL_Locale *rtn = malloc(sizeof(FL_Locale));
   rtn->lang = NULL;
diff --git a/external/findlocale/findlocale.h b/external/findlocale/findlocale.h
index c388deee4..e1ae28524 100644
--- a/external/findlocale/findlocale.h
+++ b/external/findlocale/findlocale.h
@@ -27,7 +27,7 @@ typedef enum {
 /* This allocates/fills in a FL_Locale structure with pointers to
    strings (which should be treated as static), or NULL for inappropriate /
    undetected fields. */
-FL_Success FL_FindLocale(FL_Locale **locale, FL_Domain domain);
+FL_Success FL_FindLocale(FL_Locale **locale);
 /* This should be used to free the struct written by FL_FindLocale */
 void FL_FreeLocale(FL_Locale **locale);
 
diff --git a/src/object/rainsplash.cpp b/src/object/rainsplash.cpp
index 3ad899a2f..d03b014f4 100644
--- a/src/object/rainsplash.cpp
+++ b/src/object/rainsplash.cpp
@@ -39,7 +39,7 @@ RainSplash::hit(Player& )
 void
 RainSplash::update(float time)
 {
-  time = 0;//just so i don't get an "unused variable" error - don't know how to circumvent this
+  (void) time;
   frame++;
   if (frame >= 10) remove_me();
 }
diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 3dccd6e38..d89420fb9 100644
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -89,7 +89,7 @@ Main::init_tinygettext()
     dictionary_manager->set_language(tinygettext::Language::from_name(g_config->locale));
   } else {
     FL_Locale *locale;
-    FL_FindLocale(&locale, FL_MESSAGES);
+    FL_FindLocale(&locale);
     tinygettext::Language language = tinygettext::Language::from_spec( locale->lang?locale->lang:"", locale->country?locale->country:"", locale->variant?locale->variant:"");
     FL_FreeLocale(&locale);
     dictionary_manager->set_language(language);
diff --git a/src/supertux/menu/language_menu.cpp b/src/supertux/menu/language_menu.cpp
index fab8544d1..7958a60d5 100644
--- a/src/supertux/menu/language_menu.cpp
+++ b/src/supertux/menu/language_menu.cpp
@@ -55,7 +55,7 @@ LanguageMenu::menu_action(MenuItem* item)
   if (item->id == MNID_LANGUAGE_AUTO_DETECT) // auto detect
   {
     FL_Locale *locale;
-    FL_FindLocale(&locale, FL_MESSAGES);
+    FL_FindLocale(&locale);
     tinygettext::Language language = tinygettext::Language::from_spec( locale->lang?locale->lang:"", locale->country?locale->country:"", locale->variant?locale->variant:"");
     FL_FreeLocale(&locale);