[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle.cxx,1.1,1.2 smoke_particle.cxx,1.2,1.3 smoke_particle.hxx,1.2,1.3

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/particles
In directory dark:/tmp/cvs-serv12200/particles

Modified Files:
        pingu_particle.cxx smoke_particle.cxx smoke_particle.hxx 
Log Message:
some cleanup in the resource loading, speed should be back to normal

Index: pingu_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingu_particle.cxx  12 Jun 2002 19:11:31 -0000      1.1
+++ pingu_particle.cxx  28 Jun 2002 17:48:42 -0000      1.2
@@ -30,7 +30,11 @@
 
 PinguParticle::PinguParticle()
 {
-  surface = PingusResource::load_surface("Particles/particle", "pingus");
+  if (!sur)
+    sur = PingusResource::load_surface("Particles/particle", "pingus");
+  
+  surface = sur;
+  
   livetime = 50 + (rand() % 25);
   size  = 1.0;
   size_add = (frand() - 0.2) / 35;

Index: smoke_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/smoke_particle.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smoke_particle.cxx  13 Jun 2002 14:25:13 -0000      1.2
+++ smoke_particle.cxx  28 Jun 2002 17:48:42 -0000      1.3
@@ -21,6 +21,9 @@
 #include "../pingus_resource.hxx"
 #include "smoke_particle.hxx"
 
+CL_Surface SmokeParticle::surf1;
+CL_Surface SmokeParticle::surf2;
+
 SmokeParticle::SmokeParticle()
 {
 }
@@ -32,9 +35,17 @@
 {
   // FIXME: Probably slow??
   if (rand() % 2)
-    surface = PingusResource::load_surface("Particles/smoke", "pingus");
+    {
+      if (!surf1)
+       surf1 = PingusResource::load_surface("Particles/smoke", "pingus");
+      surface = surf1;
+    }
   else
-    surface = PingusResource::load_surface("Particles/smoke2", "pingus");
+    {
+      if (!surf2)
+       surf2 = PingusResource::load_surface("Particles/smoke2", "pingus");
+      surface = surf2;
+    }
 
   livetime = 25 + (rand() % 10);
   time = livetime;

Index: smoke_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/smoke_particle.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smoke_particle.hxx  24 Jun 2002 22:52:59 -0000      1.2
+++ smoke_particle.hxx  28 Jun 2002 17:48:42 -0000      1.3
@@ -26,20 +26,16 @@
 class SmokeParticle : public Particle
 {
 private:
-  ///
   int time;
+  static CL_Surface surf1;
+  static CL_Surface surf2;
 public:
-  ///
   SmokeParticle();
-  ///
   SmokeParticle(int, int, float, float);
 
-  ///
   void update(float delta);
-  ///
   void draw_offset(int ofx, int ofy, float s);
-}///
-;
+};
 
 #endif