[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3670 - in trunk/pingus/src: . worldmap
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3670 - in trunk/pingus/src: . worldmap |
Date: |
Fri, 4 Jul 2008 20:51:41 +0200 |
Author: grumbel
Date: 2008-07-04 20:51:40 +0200 (Fri, 04 Jul 2008)
New Revision: 3670
Modified:
trunk/pingus/src/pingus_menu.cpp
trunk/pingus/src/worldmap/surface_drawable.cpp
trunk/pingus/src/worldmap/worldmap.cpp
trunk/pingus/src/worldmap/worldmap.hpp
Log:
Reimplemented a bit of the stuff that was #if 0'ed with the last commit
Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp 2008-07-04 09:37:23 UTC (rev 3669)
+++ trunk/pingus/src/pingus_menu.cpp 2008-07-04 18:51:40 UTC (rev 3670)
@@ -35,8 +35,7 @@
#include "pathname.hpp"
#include "editor/editor_screen.hpp"
#include "credits.hpp"
-
-
+
PingusMenu::PingusMenu (PingusMenuManager* m)
: PingusSubMenu (m)
{
@@ -228,5 +227,5 @@
{
//text_scroll_offset += 100.0f * delta;
}
-
+
/* EOF */
Modified: trunk/pingus/src/worldmap/surface_drawable.cpp
===================================================================
--- trunk/pingus/src/worldmap/surface_drawable.cpp 2008-07-04 09:37:23 UTC
(rev 3669)
+++ trunk/pingus/src/worldmap/surface_drawable.cpp 2008-07-04 18:51:40 UTC
(rev 3670)
@@ -52,8 +52,7 @@
{
if (auto_uncover)
{
-#if 0 // FIXME: Fri Jul 4 10:42:06 2008
- Vector3f pingus_pos =
WorldMapScreen::instance()->get_worldmap()->get_pingus()->get_pos();
+ Vector3f pingus_pos = WorldMap::current()->get_pingus()->get_pos();
// Pingu is not over the surface
if (!(pingus_pos.x > pos.x && pingus_pos.x < pos.x +
surface.get_width()
&&
@@ -65,7 +64,6 @@
{ // FIXME: Hack for the 0.6.0 release/tutorial world remove later
gc.draw(surface, pos);
}
-#endif
}
else
{
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2008-07-04 09:37:23 UTC (rev
3669)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2008-07-04 18:51:40 UTC (rev
3670)
@@ -49,11 +49,15 @@
namespace WorldMapNS {
+WorldMap* WorldMap::current_ = 0;
+
WorldMap::WorldMap(const std::string& arg_filename)
: filename(arg_filename),
mouse_x(0),
mouse_y(0)
{
+ current_ = this;
+
parse_file(FileReader::parse(path_manager.complete(filename)));
pingus = new Pingus(path_graph);
Modified: trunk/pingus/src/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.hpp 2008-07-04 09:37:23 UTC (rev
3669)
+++ trunk/pingus/src/worldmap/worldmap.hpp 2008-07-04 18:51:40 UTC (rev
3670)
@@ -85,7 +85,11 @@
int mouse_x;
int mouse_y;
+private:
+ static WorldMap* current_;
public:
+ static WorldMap* current() { return current_; }
+
/** Load the given*/
WorldMap(const std::string& filename);
~WorldMap();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3670 - in trunk/pingus/src: . worldmap,
grumbel at BerliOS <=