[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx, 1.19, 1.20 basher.cxx, 1.31, 1.32 boarder.cxx, 1.16, 1.17 bomber.cxx, 1.36, 1.37 rocket_launcher.cxx, 1.16, 1.17 superman.cxx, 1.13, 1.14 waiter.cxx, 1.17, 1.18

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/actions
In directory dark:/tmp/cvs-serv31952/actions

Modified Files:
        angel.cxx basher.cxx boarder.cxx bomber.cxx 
        rocket_launcher.cxx superman.cxx waiter.cxx 
Log Message:
- some more stuff, compiles now, but doesn't link (as expected)

Index: angel.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/angel.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- angel.cxx   18 Oct 2003 23:17:27 -0000      1.19
+++ angel.cxx   22 Oct 2003 11:11:23 -0000      1.20
@@ -32,7 +32,7 @@
   : PinguAction(p),
     counter(0.0),
     x_pos(pingu->get_x()),
-    sprite(PingusResource::load_surface("Pingus/angel" + 
to_string(pingu->get_owner()), "pingus"))
+    sprite("Pingus/angel" + to_string(pingu->get_owner()), "pingus")
 {
   sprite.set_align_center_bottom();
 }

Index: basher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- basher.cxx  21 Oct 2003 11:01:52 -0000      1.31
+++ basher.cxx  22 Oct 2003 11:11:23 -0000      1.32
@@ -32,7 +32,7 @@
 
 Basher::Basher (Pingu* p)
   : PinguAction(p),
-    sprite(PingusResource::load_surface("Pingus/basher0", "pingus")),
+    sprite("Pingus/basher0", "pingus"),
     bash_radius(PingusResource::load_surface("Other/bash_radius", "pingus")),
     bash_radius_gfx(PingusResource::load_surface("Other/bash_radius_gfx", 
"pingus")),
     basher_c(0),

Index: boarder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/boarder.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- boarder.cxx 18 Oct 2003 23:17:27 -0000      1.16
+++ boarder.cxx 22 Oct 2003 11:11:23 -0000      1.17
@@ -31,7 +31,7 @@
   : PinguAction(p),
     x_pos(pingu->get_x()),
     speed(0.0),
-    sprite(PingusResource::load_surface("Pingus/boarder" + 
to_string(pingu->get_owner ()), "pingus"))
+    sprite("Pingus/boarder" + to_string(pingu->get_owner()), "pingus")
 {
   sprite.set_align_center_bottom();
 }

Index: bomber.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- bomber.cxx  21 Oct 2003 11:01:52 -0000      1.36
+++ bomber.cxx  22 Oct 2003 11:11:23 -0000      1.37
@@ -46,14 +46,15 @@
     sound_played(false),
     gfx_exploded(false),
     colmap_exploded(false),
-    sprite(PingusResource::load_surface("Pingus/bomber" + 
to_string(pingu->get_owner()), "pingus"), 17.0f, Sprite::NONE, Sprite::ONCE),
+    sprite("Pingus/bomber" + to_string(pingu->get_owner()), "pingus", 
+           17.0f, Sprite::NONE, Sprite::ONCE),
     explo_surf(PingusResource::load_surface("Other/explo" + 
to_string(pingu->get_owner()), "pingus"))
 {
   // Only load the surface again if no static_surface is available
   if (!static_surface_loaded)
     {
       static_surface_loaded = true;
-      bomber_radius = PingusResource::load_surface ("Other/bomber_radius", 
"pingus");
+      bomber_radius     = PingusResource::load_surface ("Other/bomber_radius", 
"pingus");
       bomber_radius_gfx = PingusResource::load_surface 
("Other/bomber_radius_gfx", "pingus");
     }
   sprite.set_align_center_bottom();

Index: rocket_launcher.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/rocket_launcher.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- rocket_launcher.cxx 18 Oct 2003 23:17:27 -0000      1.16
+++ rocket_launcher.cxx 22 Oct 2003 11:11:23 -0000      1.17
@@ -32,7 +32,8 @@
 
 RocketLauncher::RocketLauncher (Pingu* p)
   : PinguAction(p),
-    sprite(PingusResource::load_surface("Pingus/rocketlauncher" + 
to_string(pingu->get_owner()), "pingus"), 10.0f, Sprite::NONE, Sprite::ONCE),
+    sprite("Pingus/rocketlauncher" + to_string(pingu->get_owner()), "pingus",
+           10.0f, Sprite::NONE, Sprite::ONCE),
     launched(false)
 {
   sprite.set_align_center_bottom();

Index: superman.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/superman.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- superman.cxx        18 Oct 2003 23:17:27 -0000      1.13
+++ superman.cxx        22 Oct 2003 11:11:23 -0000      1.14
@@ -30,7 +30,7 @@
   : PinguAction(p),
     counter(0.0f),
     x_pos(pingu->get_x()),
-    sprite(PingusResource::load_surface("Pingus/superman" + 
to_string(pingu->get_owner()), "pingus"))
+    sprite("Pingus/superman" + to_string(pingu->get_owner()), "pingus")
 {
   sprite.set_align_center_bottom();
 }

Index: waiter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/actions/waiter.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- waiter.cxx  18 Oct 2003 23:17:27 -0000      1.17
+++ waiter.cxx  22 Oct 2003 11:11:23 -0000      1.18
@@ -29,7 +29,7 @@
 Waiter::Waiter (Pingu* p)
   : PinguAction(p),
     countdown(2.0f),
-    sprite(PingusResource::load_surface("Pingus/waiter", "pingus"), 5.0f)
+    sprite("Pingus/waiter", "pingus", 5.0f)
 {
   sprite.set_align_center_bottom();
 }