[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2465 - in trunk: data/data data/images data/images/pingus
|
From: |
David Philippi at BerliOS |
|
Subject: |
[Pingus-CVS] r2465 - in trunk: data/data data/images data/images/pingus data/images/pingus/common data/images/pingus/player0 data/images/pingus/player1 data/images/pingus/player2 data/images/pingus/player3 src src/actions |
|
Date: |
Tue, 25 Oct 2005 15:32:54 +0200 |
Author: torangan
Date: 2005-10-25 15:31:36 +0200 (Tue, 25 Oct 2005)
New Revision: 2465
Added:
trunk/data/images/pingus/common/
trunk/data/images/pingus/common/bash_radius.png
trunk/data/images/pingus/common/bash_radius_gfx.png
trunk/data/images/pingus/common/bomber_radius.png
trunk/data/images/pingus/common/bomber_radius_gfx.png
trunk/data/images/pingus/common/brick_left.png
trunk/data/images/pingus/common/brick_right.png
trunk/data/images/pingus/common/digger_radius.png
trunk/data/images/pingus/common/digger_radius_gfx.png
trunk/data/images/pingus/common/floaterlayer.png
trunk/data/images/pingus/common/laser_kill.png
trunk/data/images/pingus/common/light.png
trunk/data/images/pingus/common/splash.png
trunk/data/images/pingus/common/splash_debris.png
trunk/data/images/pingus/common/xmas-walker.png
trunk/data/images/pingus/player0/
trunk/data/images/pingus/player0/angel.png
trunk/data/images/pingus/player0/basher.png
trunk/data/images/pingus/player0/blocker.png
trunk/data/images/pingus/player0/boarder.png
trunk/data/images/pingus/player0/bomber.png
trunk/data/images/pingus/player0/bridger.png
trunk/data/images/pingus/player0/bridger_walk.png
trunk/data/images/pingus/player0/climber.png
trunk/data/images/pingus/player0/digger.png
trunk/data/images/pingus/player0/drownfall.png
trunk/data/images/pingus/player0/drownwalk.png
trunk/data/images/pingus/player0/exit.png
trunk/data/images/pingus/player0/explo.png
trunk/data/images/pingus/player0/faller.png
trunk/data/images/pingus/player0/floater.png
trunk/data/images/pingus/player0/miner.png
trunk/data/images/pingus/player0/rocketlauncher.png
trunk/data/images/pingus/player0/slider.png
trunk/data/images/pingus/player0/splat.png
trunk/data/images/pingus/player0/superman.png
trunk/data/images/pingus/player0/tumble.png
trunk/data/images/pingus/player0/waiter.png
trunk/data/images/pingus/player0/walker.png
trunk/data/images/pingus/player1/
trunk/data/images/pingus/player1/angel.png
trunk/data/images/pingus/player1/basher.png
trunk/data/images/pingus/player1/blocker.png
trunk/data/images/pingus/player1/boarder.png
trunk/data/images/pingus/player1/bomber.png
trunk/data/images/pingus/player1/bridger.png
trunk/data/images/pingus/player1/bridger_walk.png
trunk/data/images/pingus/player1/climber.png
trunk/data/images/pingus/player1/digger.png
trunk/data/images/pingus/player1/drownfall.png
trunk/data/images/pingus/player1/drownwalk.png
trunk/data/images/pingus/player1/exit.png
trunk/data/images/pingus/player1/explo.png
trunk/data/images/pingus/player1/faller.png
trunk/data/images/pingus/player1/floater.png
trunk/data/images/pingus/player1/miner.png
trunk/data/images/pingus/player1/rocketlauncher.png
trunk/data/images/pingus/player1/slider.png
trunk/data/images/pingus/player1/splat.png
trunk/data/images/pingus/player1/superman.png
trunk/data/images/pingus/player1/tumble.png
trunk/data/images/pingus/player1/waiter.png
trunk/data/images/pingus/player1/walker.png
trunk/data/images/pingus/player2/
trunk/data/images/pingus/player2/angel.png
trunk/data/images/pingus/player2/basher.png
trunk/data/images/pingus/player2/blocker.png
trunk/data/images/pingus/player2/boarder.png
trunk/data/images/pingus/player2/bomber.png
trunk/data/images/pingus/player2/bridger.png
trunk/data/images/pingus/player2/bridger_walk.png
trunk/data/images/pingus/player2/climber.png
trunk/data/images/pingus/player2/digger.png
trunk/data/images/pingus/player2/drownfall.png
trunk/data/images/pingus/player2/drownwalk.png
trunk/data/images/pingus/player2/exit.png
trunk/data/images/pingus/player2/explo.png
trunk/data/images/pingus/player2/faller.png
trunk/data/images/pingus/player2/floater.png
trunk/data/images/pingus/player2/miner.png
trunk/data/images/pingus/player2/rocketlauncher.png
trunk/data/images/pingus/player2/slider.png
trunk/data/images/pingus/player2/splat.png
trunk/data/images/pingus/player2/superman.png
trunk/data/images/pingus/player2/tumble.png
trunk/data/images/pingus/player2/waiter.png
trunk/data/images/pingus/player2/walker.png
trunk/data/images/pingus/player3/
trunk/data/images/pingus/player3/angel.png
trunk/data/images/pingus/player3/basher.png
trunk/data/images/pingus/player3/blocker.png
trunk/data/images/pingus/player3/boarder.png
trunk/data/images/pingus/player3/bomber.png
trunk/data/images/pingus/player3/bridger.png
trunk/data/images/pingus/player3/bridger_walk.png
trunk/data/images/pingus/player3/climber.png
trunk/data/images/pingus/player3/digger.png
trunk/data/images/pingus/player3/drownfall.png
trunk/data/images/pingus/player3/drownwalk.png
trunk/data/images/pingus/player3/exit.png
trunk/data/images/pingus/player3/explo.png
trunk/data/images/pingus/player3/faller.png
trunk/data/images/pingus/player3/floater.png
trunk/data/images/pingus/player3/miner.png
trunk/data/images/pingus/player3/rocketlauncher.png
trunk/data/images/pingus/player3/slider.png
trunk/data/images/pingus/player3/splat.png
trunk/data/images/pingus/player3/superman.png
trunk/data/images/pingus/player3/tumble.png
trunk/data/images/pingus/player3/waiter.png
trunk/data/images/pingus/player3/walker.png
Modified:
trunk/data/data/Makefile.am
trunk/data/images/Makefile.am
trunk/data/images/pingus/README
trunk/src/action_button.cxx
trunk/src/actions/angel.cxx
trunk/src/actions/basher.cxx
trunk/src/actions/blocker.cxx
trunk/src/actions/boarder.cxx
trunk/src/actions/bomber.cxx
trunk/src/actions/bridger.cxx
trunk/src/actions/climber.cxx
trunk/src/actions/digger.cxx
trunk/src/actions/drown.cxx
trunk/src/actions/exiter.cxx
trunk/src/actions/faller.cxx
trunk/src/actions/floater.cxx
trunk/src/actions/jumper.cxx
trunk/src/actions/miner.cxx
trunk/src/actions/rocket_launcher.cxx
trunk/src/actions/slider.cxx
trunk/src/actions/smashed.cxx
trunk/src/actions/splashed.cxx
trunk/src/actions/superman.cxx
trunk/src/actions/teleported.cxx
trunk/src/actions/waiter.cxx
trunk/src/actions/walker.cxx
trunk/src/pingu.cxx
trunk/src/pingu.hxx
trunk/src/resource.cxx
Log:
applied multiplayer patch from Jason Green
Modified: trunk/data/data/Makefile.am
===================================================================
--- trunk/data/data/Makefile.am 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/data/data/Makefile.am 2005-10-25 13:31:36 UTC (rev 2465)
@@ -18,8 +18,13 @@
pkgdatadir = $(datadir)/games/@PACKAGE@/data
EXTRA_DIST = \
-pingus.xml \
-alias.xml \
+pingus-player0.xml \
+pingus-player1.xml \
+pingus-player2.xml \
+pingus-player3.xml \
+pingus-common.xml \
+particles.xml \
+alias.xml \
fonts.xml \
entrances.xml \
traps.xml \
Modified: trunk/data/images/Makefile.am
===================================================================
--- trunk/data/images/Makefile.am 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/data/images/Makefile.am 2005-10-25 13:31:36 UTC (rev 2465)
@@ -645,94 +645,112 @@
particles/snow3.png \
particles/snow4.png \
particles/snow5.png \
-pingus/angel.png \
-pingus/bash_radius.png \
-pingus/bash_radius_gfx.png \
-pingus/basher.png \
-pingus/basher1.png \
-pingus/basher2.png \
-pingus/basher3.png \
-pingus/blocker.png \
-pingus/blocker1.png \
-pingus/blocker2.png \
-pingus/blocker3.png \
-pingus/boarder.png \
-pingus/bomber.png \
-pingus/bomber1.png \
-pingus/bomber2.png \
-pingus/bomber3.png \
-pingus/bomber_radius.png \
-pingus/bomber_radius_gfx.png \
-pingus/brick.png \
-pingus/brick_left.png \
-pingus/brick_right.png \
-pingus/bridger.png \
-pingus/bridger1.png \
-pingus/bridger2.png \
-pingus/bridger3.png \
-pingus/bridger_build.png \
-pingus/bridger_start.png \
-pingus/bridger_walk.png \
-pingus/climber.png \
-pingus/climber1.png \
-pingus/climber2.png \
-pingus/climber3.png \
-pingus/digger.png \
-pingus/digger1.png \
-pingus/digger2.png \
-pingus/digger3.png \
-pingus/digger_radius.png \
-pingus/digger_radius_gfx.png \
-pingus/drownfall.png \
-pingus/drownfall1.png \
-pingus/drownfall2.png \
-pingus/drownfall3.png \
-pingus/drownwalk.png \
-pingus/exit.png \
-pingus/exit1.png \
-pingus/exit2.png \
-pingus/exit3.png \
-pingus/explo0.png \
-pingus/explo1.png \
-pingus/explo2.png \
-pingus/explo3.png \
-pingus/faller.png \
-pingus/faller1.png \
-pingus/faller2.png \
-pingus/faller3.png \
-pingus/floater.png \
-pingus/floater1.png \
-pingus/floater2.png \
-pingus/floater3.png \
-pingus/floaterlayer.png \
-pingus/laser_kill.png \
-pingus/miner.png \
-pingus/miner1.png \
-pingus/miner2.png \
-pingus/miner3.png \
-pingus/rocketlauncher.png \
-pingus/slider.png \
-pingus/splash.png \
-pingus/splash_debris.png \
-pingus/splat.png \
-pingus/splat1.png \
-pingus/splat2.png \
-pingus/splat3.png \
-pingus/stopper.png \
-pingus/stopper1.png \
-pingus/stopper2.png \
-pingus/stopper3.png \
-pingus/superman.png \
-pingus/tumble.png \
-pingus/tumble1.png \
-pingus/tumble2.png \
-pingus/tumble3.png \
-pingus/waiter.png \
-pingus/walker.png \
-pingus/walker1.png \
-pingus/walker2.png \
-pingus/walker3.png \
-pingus/xmas-walker.png \
+pingus/common/bash_radius.png \
+pingus/common/bash_radius_gfx.png \
+pingus/common/bomber_radius.png \
+pingus/common/bomber_radius_gfx.png \
+pingus/common/brick_left.png \
+pingus/common/brick_right.png \
+pingus/common/digger_radius.png \
+pingus/common/digger_radius_gfx.png \
+pingus/common/floaterlayer.png \
+pingus/common/laser_kill.png \
+pingus/common/light.png \
+pingus/common/splash.png \
+pingus/common/splash_debris.png \
+pingus/common/xmas-walker.png \
+pingus/player0/angel.png \
+pingus/player0/basher.png \
+pingus/player0/blocker.png \
+pingus/player0/boarder.png \
+pingus/player0/bomber.png \
+pingus/player0/bridger.png \
+pingus/player0/bridger_walk.png \
+pingus/player0/climber.png \
+pingus/player0/digger.png \
+pingus/player0/drownfall.png \
+pingus/player0/drownwalk.png \
+pingus/player0/exit.png \
+pingus/player0/explo.png \
+pingus/player0/faller.png \
+pingus/player0/floater.png \
+pingus/player0/miner.png \
+pingus/player0/rocketlauncher.png \
+pingus/player0/slider.png \
+pingus/player0/splat.png \
+pingus/player0/superman.png \
+pingus/player0/tumble.png \
+pingus/player0/waiter.png \
+pingus/player0/walker.png \
+pingus/player1/angel.png \
+pingus/player1/basher.png \
+pingus/player1/blocker.png \
+pingus/player1/boarder.png \
+pingus/player1/bomber.png \
+pingus/player1/bridger.png \
+pingus/player1/bridger_walk.png \
+pingus/player1/climber.png \
+pingus/player1/digger.png \
+pingus/player1/drownfall.png \
+pingus/player1/drownwalk.png \
+pingus/player1/exit.png \
+pingus/player1/explo.png \
+pingus/player1/faller.png \
+pingus/player1/floater.png \
+pingus/player1/miner.png \
+pingus/player1/rocketlauncher.png \
+pingus/player1/slider.png \
+pingus/player1/splat.png \
+pingus/player1/superman.png \
+pingus/player1/tumble.png \
+pingus/player1/waiter.png \
+pingus/player1/walker.png \
+pingus/player2/angel.png \
+pingus/player2/basher.png \
+pingus/player2/blocker.png \
+pingus/player2/boarder.png \
+pingus/player2/bomber.png \
+pingus/player2/bridger.png \
+pingus/player2/bridger_walk.png \
+pingus/player2/climber.png \
+pingus/player2/digger.png \
+pingus/player2/drownfall.png \
+pingus/player2/drownwalk.png \
+pingus/player2/exit.png \
+pingus/player2/explo.png \
+pingus/player2/faller.png \
+pingus/player2/floater.png \
+pingus/player2/miner.png \
+pingus/player2/rocketlauncher.png \
+pingus/player2/slider.png \
+pingus/player2/splat.png \
+pingus/player2/superman.png \
+pingus/player2/tumble.png \
+pingus/player2/waiter.png \
+pingus/player2/walker.png \
+pingus/player3/angel.png \
+pingus/player3/basher.png \
+pingus/player3/blocker.png \
+pingus/player3/boarder.png \
+pingus/player3/bomber.png \
+pingus/player3/bridger.png \
+pingus/player3/bridger_walk.png \
+pingus/player3/climber.png \
+pingus/player3/digger.png \
+pingus/player3/drownfall.png \
+pingus/player3/drownwalk.png \
+pingus/player3/exit.png \
+pingus/player3/explo.png \
+pingus/player3/faller.png \
+pingus/player3/floater.png \
+pingus/player3/miner.png \
+pingus/player3/rocketlauncher.png \
+pingus/player3/slider.png \
+pingus/player3/splat.png \
+pingus/player3/superman.png \
+pingus/player3/tumble.png \
+pingus/player3/waiter.png \
+pingus/player3/walker.png \
special/pacman/blinky.png \
special/pacman/clyde.png \
special/pacman/inky.png \
Modified: trunk/data/images/pingus/README
===================================================================
--- trunk/data/images/pingus/README 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/data/images/pingus/README 2005-10-25 13:31:36 UTC (rev 2465)
@@ -1,3 +1,25 @@
+Making changes to the pingus graphics
+-------------------------------------
+
+To add a new action or change an existing one, you need to
+create one for each player (0 through 3). Place them in the
+proper directory, then update data/data/pingus-player0.xml.
+
+The other "pingus-player#".xml files are exactly the same
+as pingus-player0.xml, except every reference to "player0"
+is replaced with "player1", etc. There is a script named
+data/data/update-pingus-player.sh which will copy the player0.xml
+file to the other player#'s, and replace the references to
+player0 with the appropriate number. You need 'sed' on your
+system to run this script.
+
+Also, if you add or remove images, don't forget to update
+/data/images/Makefile.am
+
+
+Credits (may be outdated)
+--------------------------------------
+
data/images/pingus
==================
@@ -12,7 +34,6 @@
faller.pcx | Joel Fauche <address@hidden>
floater.pcx | Joel Fauche <address@hidden>
miner.pcx | Stefan Stiasny <address@hidden>
-stopper.pcx | Stefan Stiasny <address@hidden>
tumble.pcx | Craig Timpany <address@hidden>
walker.pcx | Joel Fauche <address@hidden>
-
+
\ No newline at end of file
Added: trunk/data/images/pingus/common/bash_radius.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/bash_radius.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/bash_radius_gfx.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/bash_radius_gfx.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/bomber_radius.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/bomber_radius.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/bomber_radius_gfx.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/bomber_radius_gfx.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/brick_left.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/brick_left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/brick_right.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/brick_right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/digger_radius.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/digger_radius.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/digger_radius_gfx.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/digger_radius_gfx.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/floaterlayer.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/floaterlayer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/laser_kill.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/laser_kill.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/light.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/light.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/splash.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/splash.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/splash_debris.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/splash_debris.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/common/xmas-walker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/common/xmas-walker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/angel.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/angel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/basher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/basher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/blocker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/blocker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/boarder.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/boarder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/bomber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/bomber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/bridger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/bridger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/bridger_walk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/bridger_walk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/climber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/climber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/digger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/digger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/drownfall.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/drownfall.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/drownwalk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/drownwalk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/explo.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/explo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/faller.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/faller.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/floater.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/floater.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/miner.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/miner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/rocketlauncher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/rocketlauncher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/slider.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/slider.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/splat.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/splat.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/superman.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/superman.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/tumble.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/tumble.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/waiter.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/waiter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player0/walker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player0/walker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/angel.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/angel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/basher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/basher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/blocker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/blocker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/boarder.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/boarder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/bomber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/bomber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/bridger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/bridger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/bridger_walk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/bridger_walk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/climber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/climber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/digger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/digger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/drownfall.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/drownfall.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/drownwalk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/drownwalk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/explo.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/explo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/faller.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/faller.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/floater.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/floater.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/miner.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/miner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/rocketlauncher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/rocketlauncher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/slider.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/slider.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/splat.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/splat.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/superman.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/superman.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/tumble.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/tumble.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/waiter.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/waiter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player1/walker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player1/walker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/angel.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/angel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/basher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/basher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/blocker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/blocker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/boarder.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/boarder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/bomber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/bomber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/bridger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/bridger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/bridger_walk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/bridger_walk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/climber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/climber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/digger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/digger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/drownfall.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/drownfall.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/drownwalk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/drownwalk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/explo.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/explo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/faller.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/faller.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/floater.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/floater.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/miner.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/miner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/rocketlauncher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/rocketlauncher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/slider.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/slider.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/splat.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/splat.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/superman.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/superman.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/tumble.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/tumble.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/waiter.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/waiter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player2/walker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player2/walker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/angel.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/angel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/basher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/basher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/blocker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/blocker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/boarder.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/boarder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/bomber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/bomber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/bridger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/bridger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/bridger_walk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/bridger_walk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/climber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/climber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/digger.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/digger.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/drownfall.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/drownfall.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/drownwalk.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/drownwalk.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/exit.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/explo.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/explo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/faller.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/faller.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/floater.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/floater.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/miner.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/miner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/rocketlauncher.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/rocketlauncher.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/slider.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/slider.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/splat.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/splat.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/superman.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/superman.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/tumble.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/tumble.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/waiter.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/waiter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/pingus/player3/walker.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/pingus/player3/walker.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/action_button.cxx
===================================================================
--- trunk/src/action_button.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/action_button.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -49,7 +49,7 @@
font = Fonts::pingus_small;
font_b = Fonts::pingus_large;
- sprite = Resource::load_sprite("pingus/" + action_to_string(name) +
"/right");
+ sprite = Resource::load_sprite("pingus/player0/" + action_to_string(name) +
"/right");
sprite.set_play_loop(true);
}
Modified: trunk/src/actions/angel.cxx
===================================================================
--- trunk/src/actions/angel.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/angel.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -31,7 +31,7 @@
: PinguAction(p),
counter(0.0),
x_pos(pingu->get_x()),
- sprite(Resource::load_sprite("pingus/angel"))
+ sprite(Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/angel"))
{
}
Modified: trunk/src/actions/basher.cxx
===================================================================
--- trunk/src/actions/basher.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/basher.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -37,8 +37,10 @@
basher_c(0),
first_bash(true)
{
- sprite.load(Direction::LEFT, Resource::load_sprite("pingus/basher/left"));
- sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/basher/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/basher/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/basher/right"));
bash_radius_width = bash_radius.get_width();
bash_radius_gfx_width = bash_radius_gfx.get_width();
Modified: trunk/src/actions/blocker.cxx
===================================================================
--- trunk/src/actions/blocker.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/blocker.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -32,8 +32,8 @@
Blocker::Blocker(Pingu* p)
: PinguAction(p)
{
- sprite.load(Direction::LEFT, "pingus/blocker/left");
- sprite.load(Direction::RIGHT, "pingus/blocker/right");
+ sprite.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
"/blocker/left");
+ sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
"/blocker/right");
if ( rel_getpixel(0,-1) == Groundtype::GP_NOTHING
&& rel_getpixel(0, -2) == Groundtype::GP_GROUND)
Modified: trunk/src/actions/boarder.cxx
===================================================================
--- trunk/src/actions/boarder.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/boarder.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -31,8 +31,10 @@
x_pos(pingu->get_x()),
speed(0.0)
{
- sprite.load(Direction::LEFT, Resource::load_sprite("pingus/boarder/left"));
- sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/boarder/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/boarder/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/boarder/right"));
}
void
Modified: trunk/src/actions/bomber.cxx
===================================================================
--- trunk/src/actions/bomber.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/bomber.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -45,10 +45,10 @@
sound_played(false),
gfx_exploded(false),
colmap_exploded(false),
- explo_surf(Resource::load_sprite("other/explo"))
+ explo_surf(Resource::load_sprite("pingus/player" + pingu->get_owner_str()
+ "/explo"))
{
- sprite.load(Direction::LEFT, "pingus/bomber/left");
- sprite.load(Direction::RIGHT, "pingus/bomber/right");
+ sprite.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
"/bomber/left");
+ sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
"/bomber/right");
// Only load the surface again if no static_surface is available
if (!static_surface_loaded)
Modified: trunk/src/actions/bridger.cxx
===================================================================
--- trunk/src/actions/bridger.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/bridger.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -39,11 +39,15 @@
block_build(false),
name(_("Bridger") + std::string(" (") + CL_String::to(bricks) + ")")
{
- walk_sprite.load (Direction::LEFT,
Resource::load_sprite("pingus/bridger_walk/left"));
- walk_sprite.load (Direction::RIGHT,
Resource::load_sprite("pingus/bridger_walk/right"));
+ walk_sprite.load (Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/bridger_walk/left"));
+ walk_sprite.load (Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/bridger_walk/right"));
- build_sprite.load (Direction::LEFT,
Resource::load_sprite("pingus/bridger/left"));
- build_sprite.load (Direction::RIGHT,
Resource::load_sprite("pingus/bridger/right"));
+ build_sprite.load (Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/bridger/left"));
+ build_sprite.load (Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/bridger/right"));
brick_l = Resource::load_pixelbuffer("other/brick_left");
brick_r = Resource::load_pixelbuffer("other/brick_right");
Modified: trunk/src/actions/climber.cxx
===================================================================
--- trunk/src/actions/climber.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/climber.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -29,8 +29,10 @@
Climber::Climber (Pingu* p)
: PinguAction(p)
{
- sprite.load(Direction::LEFT, Resource::load_sprite("pingus/climber/left"));
- sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/climber/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/climber/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/climber/right"));
}
void
Modified: trunk/src/actions/digger.cxx
===================================================================
--- trunk/src/actions/digger.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/digger.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -42,7 +42,7 @@
digger_radius_gfx_width = digger_radius_gfx.get_width();
digger_radius_gfx_height = digger_radius_gfx.get_height();
- sprite = Resource::load_sprite("pingus/digger/left");
+ sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/digger/left");
}
void
Modified: trunk/src/actions/drown.cxx
===================================================================
--- trunk/src/actions/drown.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/drown.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -29,8 +29,10 @@
Drown::Drown (Pingu* p)
: PinguAction(p)
{
- sprite.load(Direction::LEFT,
Resource::load_sprite("pingus/drownfall/left"));
- sprite.load(Direction::RIGHT,
Resource::load_sprite("pingus/drownfall/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/drownfall/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/drownfall/right"));
}
void
Modified: trunk/src/actions/exiter.cxx
===================================================================
--- trunk/src/actions/exiter.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/exiter.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -31,8 +31,10 @@
: PinguAction(p),
sound_played(false)
{
- sprite.load(Direction::LEFT, Resource::load_sprite("pingus/exit/left"));
- sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/exit/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/exit/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/exit/right"));
}
void
Modified: trunk/src/actions/faller.cxx
===================================================================
--- trunk/src/actions/faller.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/faller.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -36,11 +36,15 @@
Faller::Faller (Pingu* p)
: PinguAction(p)
{
- faller.load(Direction::LEFT, Resource::load_sprite("pingus/faller/left"));
- faller.load(Direction::RIGHT, Resource::load_sprite("pingus/faller/right"));
+ faller.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/faller/left"));
+ faller.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/faller/right"));
- tumbler.load(Direction::LEFT, Resource::load_sprite("pingus/tumbler/left"));
- tumbler.load(Direction::RIGHT,
Resource::load_sprite("pingus/tumbler/right"));
+ tumbler.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/tumbler/left"));
+ tumbler.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/tumbler/right"));
}
Faller::~Faller () { }
Modified: trunk/src/actions/floater.cxx
===================================================================
--- trunk/src/actions/floater.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/floater.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -31,7 +31,7 @@
falling_depth(0),
step(0)
{
- sprite = Resource::load_sprite("pingus/floater/left");
+ sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/floater/left");
}
void
Modified: trunk/src/actions/jumper.cxx
===================================================================
--- trunk/src/actions/jumper.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/jumper.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -29,8 +29,10 @@
Jumper::Jumper (Pingu* p)
: PinguAction(p)
{
- sprite.load(Direction::LEFT, Resource::load_sprite("pingus/jumper/left"));
- sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/jumper/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/jumper/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/jumper/right"));
}
void
Modified: trunk/src/actions/miner.cxx
===================================================================
--- trunk/src/actions/miner.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/miner.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -35,8 +35,10 @@
miner_radius_gfx(Resource::load_pixelbuffer("other/bash_radius_gfx")),
slow_count(0)
{
- sprite.load(Direction::LEFT, Resource::load_sprite("pingus/miner/left"));
- sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/miner/right"));
+ sprite.load(Direction::LEFT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/miner/left"));
+ sprite.load(Direction::RIGHT, Resource::load_sprite("pingus/player" +
+ pingu->get_owner_str() + "/miner/right"));
miner_radius_width = miner_radius.get_width();
miner_radius_gfx_width = miner_radius_gfx.get_width();
Modified: trunk/src/actions/rocket_launcher.cxx
===================================================================
--- trunk/src/actions/rocket_launcher.cxx 2005-10-17 15:47:04 UTC (rev
2464)
+++ trunk/src/actions/rocket_launcher.cxx 2005-10-25 13:31:36 UTC (rev
2465)
@@ -33,8 +33,10 @@
: PinguAction(p),
launched(false)
{
- sprite.load(Direction::LEFT, "pingus/rocketlauncher/left");
- sprite.load(Direction::RIGHT, "pingus/rocketlauncher/right");
+ sprite.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
+ "/rocketlauncher/left");
+ sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
+ "/rocketlauncher/right");
/* Explosive Particles not supported right now
WorldObj::get_world()->get_particle_holder()->add_particle
Modified: trunk/src/actions/slider.cxx
===================================================================
--- trunk/src/actions/slider.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/slider.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -30,8 +30,10 @@
: PinguAction(p),
speed(10)
{
- sprite.load(Direction::LEFT, "pingus/slider/left");
- sprite.load(Direction::RIGHT, "pingus/slider/right");
+ sprite.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
+ "/slider/left");
+ sprite.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
+ "/slider/right");
}
void
Modified: trunk/src/actions/smashed.cxx
===================================================================
--- trunk/src/actions/smashed.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/smashed.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -30,7 +30,7 @@
: PinguAction(p),
sound_played(false)
{
- sprite = Resource::load_sprite("pingus/bomber");
+ sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/bomber");
}
void
Modified: trunk/src/actions/splashed.cxx
===================================================================
--- trunk/src/actions/splashed.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/splashed.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -33,7 +33,7 @@
particle_thrown(false),
sound_played(false)
{
- sprite = Resource::load_sprite("pingus/splat");
+ sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/splat");
}
void
Modified: trunk/src/actions/superman.cxx
===================================================================
--- trunk/src/actions/superman.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/superman.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -29,7 +29,7 @@
: PinguAction(p),
counter(0.0f),
x_pos(pingu->get_x()),
- sprite(Resource::load_sprite("pingus/superman"))
+ sprite(Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/superman"))
{
}
Modified: trunk/src/actions/teleported.cxx
===================================================================
--- trunk/src/actions/teleported.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/teleported.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -29,7 +29,7 @@
: PinguAction(p),
sound_played(false)
{
- sprite = Resource::load_sprite("pingus/bomber");
+ sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/bomber");
}
Modified: trunk/src/actions/waiter.cxx
===================================================================
--- trunk/src/actions/waiter.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/waiter.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -30,7 +30,7 @@
: PinguAction(p),
countdown(2.0f)
{
- sprite = Resource::load_sprite("pingus/waiter/left");
+ sprite = Resource::load_sprite("pingus/player" + pingu->get_owner_str() +
"/waiter/left");
}
void
Modified: trunk/src/actions/walker.cxx
===================================================================
--- trunk/src/actions/walker.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/actions/walker.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -30,11 +30,11 @@
Walker::Walker (Pingu* p)
: PinguAction(p)
{
- walker.load(Direction::LEFT, "pingus/walker/left");
- walker.load(Direction::RIGHT, "pingus/walker/right");
+ walker.load(Direction::LEFT, "pingus/player" + pingu->get_owner_str() +
"/walker/left");
+ walker.load(Direction::RIGHT, "pingus/player" + pingu->get_owner_str() +
"/walker/right");
- floaterlayer.load(Direction::LEFT, "pingus/floaterlayer/left");
- floaterlayer.load(Direction::RIGHT, "pingus/floaterlayer/right");
+ floaterlayer.load(Direction::LEFT, "other/floaterlayer/left");
+ floaterlayer.load(Direction::RIGHT, "other/floaterlayer/right");
// Reset the velocity
pingu->set_velocity(Vector());
Modified: trunk/src/pingu.cxx
===================================================================
--- trunk/src/pingu.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/pingu.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -17,6 +17,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#include <sstream>
#include <assert.h>
#include <math.h>
#include <stdio.h>
@@ -39,7 +40,7 @@
// Init a pingu at the given position while falling
Pingu::Pingu (int arg_id, const Vector& arg_pos, int owner)
- : light(Resource::load_sprite("pingus/light")),
+ : light(Resource::load_sprite("other/light")),
action(0),
countdown_action (0),
wall_action(0),
@@ -436,6 +437,14 @@
return owner_id;
}
+std::string
+Pingu::get_owner_str ()
+{
+ std::ostringstream ostr;
+ ostr << owner_id;
+ return ostr.str();
+}
+
bool
Pingu::catchable ()
{
Modified: trunk/src/pingu.hxx
===================================================================
--- trunk/src/pingu.hxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/pingu.hxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -190,8 +190,12 @@
float get_z_pos () const { return 0; }
/** @return The owner_id of the owner, only used in multiplayer
- configurations, ought to bed single player */
+ configurations, ought to be 0 in single player */
int get_owner ();
+
+ /** @return The owner_id as a string. Only used in multiplayer
+ configurations, ought to be "0" in single player */
+ std::string get_owner_str ();
bool is_over (int x, int y);
Modified: trunk/src/resource.cxx
===================================================================
--- trunk/src/resource.cxx 2005-10-17 15:47:04 UTC (rev 2464)
+++ trunk/src/resource.cxx 2005-10-25 13:31:36 UTC (rev 2465)
@@ -55,7 +55,12 @@
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/groundpieces-transparent.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/hotspots.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/liquids.xml")));
-
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/pingus.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/pingus-player0.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/pingus-player1.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/pingus-player2.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/pingus-player3.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/pingus-common.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/particles.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/story.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/textures.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/traps.xml")));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2465 - in trunk: data/data data/images data/images/pingus data/images/pingus/common data/images/pingus/player0 data/images/pingus/player1 data/images/pingus/player2 data/images/pingus/player3 src src/actions,
David Philippi at BerliOS <=