[Super-tux-commit] supertux/src gameobjs.cpp,1.26,1.27 gameobjs.h,1.17,1.18

[Ryan F. <sik...@us...>]

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

Modified Files:
	gameobjs.cpp gameobjs.h 
Log Message:
- ObjectManager stuff

Index: gameobjs.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gameobjs.cpp	18 May 2004 18:12:16 -0000	1.26
+++ gameobjs.cpp	18 May 2004 19:17:33 -0000	1.27
@@ -479,5 +479,69 @@
 */
 }
 
+void ObjectManager::draw_bg()
+{
+/*
+  for (unsigned int i = 0; i < bouncy_bricks.size(); ++i)
+    bouncy_bricks[i]->draw();
+
+  for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
+    (*i)->draw();
+
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+    (*i)->draw();
+*/
+}
+
+void ObjectManager::draw_fg()
+{
+/*
+  for (unsigned int i = 0; i < bullets.size(); ++i)
+    bullets[i].draw();
+
+  for (unsigned int i = 0; i < floating_scores.size(); ++i)
+    floating_scores[i]->draw();
+
+  for (unsigned int i = 0; i < upgrades.size(); ++i)
+    upgrades[i].draw();
+
+  for (unsigned int i = 0; i < bouncy_distros.size(); ++i)
+    bouncy_distros[i]->draw();
+
+  for (unsigned int i = 0; i < broken_bricks.size(); ++i)
+    broken_bricks[i]->draw();
+*/
+}
+
+void ObjectManager::actions()
+{
+/*
+  for (unsigned int i = 0; i < bouncy_distros.size(); i++)
+    bouncy_distros[i]->action(frame_ratio);
+
+  for (unsigned int i = 0; i < broken_bricks.size(); i++)
+    broken_bricks[i]->action(frame_ratio);
+
+  // Handle all kinds of game objects
+  for (unsigned int i = 0; i < bouncy_bricks.size(); i++)
+    bouncy_bricks[i]->action(frame_ratio);
+  
+  for (unsigned int i = 0; i < floating_scores.size(); i++)
+    floating_scores[i]->action(frame_ratio);
+
+  for (unsigned int i = 0; i < bullets.size(); ++i)
+    bullets[i].action(frame_ratio);
+  
+  for (unsigned int i = 0; i < upgrades.size(); i++)
+    upgrades[i].action(frame_ratio);
+
+  for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
+    (*i)->action(frame_ratio);
+
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+     (*i)->action(frame_ratio);
+*/
+}
+
 /* EOF */
 

Index: gameobjs.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameobjs.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gameobjs.h	18 May 2004 18:12:16 -0000	1.17
+++ gameobjs.h	18 May 2004 19:17:33 -0000	1.18
@@ -152,10 +152,10 @@
   // XXX Objects will have to be split up into two categories:
   //  - Drawn before tux
   //  - Drawn after tux
+  // Eventually Player should be a part of ObjectManager
 
   std::vector<BadGuy*> badguys;
   std::vector<Trampoline> trampolines;
-  //std::vector<ParticleSystem> particle_systems;
   std::vector<BouncyDistro> bouncy_distros;
   std::vector<BrokenBrick> broken_bricks;
   std::vector<BouncyBrick> bouncy_bricks;
@@ -167,6 +167,10 @@
  public:
   static ObjectManager* instance() { return instance_ ? instance_ : instance_ = new ObjectManager(); }
   static void destroy_instance() { delete instance_; instance_ = 0; }
+
+  void draw_bg();
+  void draw_fg();
+  void actions();
   
 /*  Object* get(unsigned int id) {
     if(id < badguys.size())