[Pingus-CVS] r3569 - trunk/pingus/src

[grumbel at BerliOS]

Author: grumbel
Date: 2008-03-25 07:01:41 +0100 (Tue, 25 Mar 2008)
New Revision: 3569

Modified:
   trunk/pingus/src/level_menu.cpp
   trunk/pingus/src/option_menu.cpp
Log:
- fixed levelset scrolling
- fixed TinyGetText issue

Modified: trunk/pingus/src/level_menu.cpp
===================================================================
--- trunk/pingus/src/level_menu.cpp     2008-03-24 20:33:27 UTC (rev 3568)
+++ trunk/pingus/src/level_menu.cpp     2008-03-25 06:01:41 UTC (rev 3569)
@@ -191,7 +191,7 @@
 
     if (!levelsets.empty())
       {
-        int i = y / 95;
+        int i = y / 95 + page*3;
 
         if (i >= 0 && i < static_cast<int>(levelsets.size()))
           current_levelset = levelsets[i];
@@ -202,6 +202,8 @@
 
   void on_primary_button_press (int x, int y)
   {
+    on_pointer_move(x, y);
+
     if (current_levelset)
       {
         level_menu->set_levelset(current_levelset);
@@ -296,19 +298,27 @@
     levelset = levelset_;
   }
 
+  int get_current_level(int x, int y)
+  {
+    int cl = current_level = y / 32 + page*8;
+    if (cl < 0 || cl >= levelset->get_level_count())
+      cl = -1;
+    return cl;
+  }
+
   void on_pointer_move(int x, int y)
   {
     x -= rect.left;
     y -= rect.top;
 
-    current_level = y / 32;
-    
+    current_level = y / 32 + page*8;
     if (current_level < 0 || current_level >= levelset->get_level_count())
       current_level = -1;
   }
 
   void on_primary_button_press (int x, int y)
   {
+    on_pointer_move(x, y);
     if (current_level != -1)
       {
         if (levelset->get_level(current_level)->accessible)

Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp    2008-03-24 20:33:27 UTC (rev 3568)
+++ trunk/pingus/src/option_menu.cpp    2008-03-25 06:01:41 UTC (rev 3569)
@@ -69,7 +69,7 @@
   std::set<std::string> lst = dictionary_manager.get_languages();
   for (std::set<std::string>::iterator i = lst.begin(); i != lst.end(); ++i)
     {
-      LanguageDef* lang = TinyGetText::get_language_def(*i);
+      TinyGetText::LanguageDef* lang = TinyGetText::get_language_def(*i);
       if (lang)
         language_box->add_choice(lang->name);
     }