[Pingus-CVS] r3345 - in trunk/pingus: data/data data/images data/images/levelsets src src/components

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-27 18:02:10 +0200 (Sat, 27 Oct 2007)
New Revision: 3345

Added:
   trunk/pingus/data/images/levelsets/
   trunk/pingus/data/images/levelsets/halloween.png
Modified:
   trunk/pingus/data/data/core.res
   trunk/pingus/src/components/menu_button.cpp
   trunk/pingus/src/components/menu_button.hpp
   trunk/pingus/src/level_menu.cpp
   trunk/pingus/src/levelset.cpp
   trunk/pingus/src/levelset.hpp
Log:
- added halloween icon

Modified: trunk/pingus/data/data/core.res
===================================================================
--- trunk/pingus/data/data/core.res     2007-10-27 11:51:35 UTC (rev 3344)
+++ trunk/pingus/data/data/core.res     2007-10-27 16:02:10 UTC (rev 3345)
@@ -1,6 +1,12 @@
 ;; -*- scheme -*-
 ;; core.xml
 (pingus-resources
+ (section (name "levelsets") ;; doesn't really belong here 
+                   (sprite
+                    (name "halloween")
+                    (image-file "../images/levelsets/halloween.png"))
+           )
+
  (section (name "core")
           (section (name "cursors")
                    (sprite
@@ -348,6 +354,11 @@
                     (image-file "../images/core/menu/menuitem.png"))
 
                    (sprite
+                    (name "menuitem_highlight")
+                    (origin "center")
+                    (image-file "../images/core/menu/menuitem_highlight.png"))
+
+                   (sprite
                     (name "marker")
                     (image-file "../images/core/menu/marker.png"))
 

Added: trunk/pingus/data/images/levelsets/halloween.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/levelsets/halloween.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/pingus/src/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/components/menu_button.cpp 2007-10-27 11:51:35 UTC (rev 
3344)
+++ trunk/pingus/src/components/menu_button.cpp 2007-10-27 16:02:10 UTC (rev 
3345)
@@ -33,6 +33,7 @@
   : menu(menu_)
 {
   surface_p = Resource::load_sprite("core/menu/menuitem");
+  highlight = Resource::load_sprite("core/menu/menuitem_highlight");
 
   text = text_;
   desc  = desc_;
@@ -79,12 +80,8 @@
   if (mouse_over) // pressed
     {
       gc.draw(surface_p,Vector2i(x_pos, y_pos));
+      gc.draw(highlight, Vector2i(x_pos, y_pos));
       gc.print_center(font_large, x_pos, y_pos - 28, text);
-      // poor mans bold formating
-      gc.print_center(font_large, x_pos-1, y_pos - 28 - 1, text);
-      gc.print_center(font_large, x_pos+1, y_pos - 28 + 1, text);
-      gc.print_center(font_large, x_pos+1, y_pos - 28 - 1, text);
-      gc.print_center(font_large, x_pos-1, y_pos - 28 + 1, text);
     }
   else
     {

Modified: trunk/pingus/src/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/components/menu_button.hpp 2007-10-27 11:51:35 UTC (rev 
3344)
+++ trunk/pingus/src/components/menu_button.hpp 2007-10-27 16:02:10 UTC (rev 
3345)
@@ -35,6 +35,7 @@
 protected:
   PingusMenu* menu;
   Sprite surface_p;
+  Sprite highlight;
   Font   font;
   Font   font_large;
 

Modified: trunk/pingus/src/level_menu.cpp
===================================================================
--- trunk/pingus/src/level_menu.cpp     2007-10-27 11:51:35 UTC (rev 3344)
+++ trunk/pingus/src/level_menu.cpp     2007-10-27 16:02:10 UTC (rev 3345)
@@ -80,9 +80,11 @@
         if (*i == current_levelset)
           gc.draw(marker, 0, y - 5);
 
-        gc.print_left(Fonts::chalk_normal, 30, 15 + y, (*i)->get_title());
-        gc.print_left(Fonts::chalk_small,  50, 40 + y, 
(*i)->get_description());
+        gc.draw((*i)->get_image(), 30, y);
 
+        gc.print_left(Fonts::chalk_normal, 85+30, 15 + y, (*i)->get_title());
+        gc.print_left(Fonts::chalk_small,  85+50, 40 + y, 
(*i)->get_description());
+
         gc.print_right(Fonts::chalk_normal, rect.get_width() - 30, 15 + y, 
(boost::format("Completion: %1%%%") % (*i)->get_completion()).str());
         gc.print_right(Fonts::chalk_small,  rect.get_width() - 30, 60 + y, 
(boost::format("%1% levels") % (*i)->get_level_count()).str());
 

Modified: trunk/pingus/src/levelset.cpp
===================================================================
--- trunk/pingus/src/levelset.cpp       2007-10-27 11:51:35 UTC (rev 3344)
+++ trunk/pingus/src/levelset.cpp       2007-10-27 16:02:10 UTC (rev 3345)
@@ -23,6 +23,7 @@
 #include "levelset.hpp"
 #include "plf_res_mgr.hpp"
 #include "savegame_manager.hpp"
+#include "resource.hpp"
 
 Levelset::Levelset(const Pathname& pathname)
 {
@@ -35,6 +36,10 @@
     {
       reader.read_string("title",       title);
       reader.read_string("description", description);
+      std::string image;
+      if (reader.read_string("image", image))
+        this->image = Resource::load_sprite(image);
+
       FileReader level_reader = reader.read_section("levels");
       std::vector<FileReader> sections = level_reader.get_sections();
       for(std::vector<FileReader>::iterator i = sections.begin(); i != 
sections.end(); ++i)
@@ -42,6 +47,7 @@
           if (i->get_name() == "level")
             {
               Level* level = new Level();
+
               if (i->read_string("filename", level->resname))
                 {
                   level->plf        = PLFResMgr::load_plf(level->resname);
@@ -101,6 +107,12 @@
   return 0;
 }
 
+Sprite
+Levelset::get_image() const
+{
+  return image;
+}
+
 void
 Levelset::refresh()
 {

Modified: trunk/pingus/src/levelset.hpp
===================================================================
--- trunk/pingus/src/levelset.hpp       2007-10-27 11:51:35 UTC (rev 3344)
+++ trunk/pingus/src/levelset.hpp       2007-10-27 16:02:10 UTC (rev 3345)
@@ -24,6 +24,7 @@
 #include <vector>
 #include "pingus_level.hpp"
 #include "pathname.hpp"
+#include "sprite.hpp"
 
 /** */
 class Levelset
@@ -39,6 +40,8 @@
 private:
   std::string title;
   std::string description;
+  Sprite image;
+
   std::vector<Level*> levels;
 
 public:
@@ -47,6 +50,8 @@
 
   std::string get_title() const;
   std::string get_description() const;
+  Sprite get_image() const;
+
   Level* get_level(int num) const;
   int get_level_count() const;