diff -Nru marsshooter-0.7/debian/changelog marsshooter-0.7/debian/changelog
--- marsshooter-0.7/debian/changelog	2011-10-05 08:30:47.000000000 +0000
+++ marsshooter-0.7/debian/changelog	2011-10-09 12:08:32.000000000 +0000
@@ -1,19 +1,8 @@
-marsshooter (0.7-3ppa3~oneiric0) oneiric; urgency=low
+marsshooter (0.7-4ppa0~oneiric0) oneiric; urgency=low
 
   * New M.A.R.S. release!
-  * forgot to update revision number... again...
-  * added Mongolian translation by Team GaVaL
-  * applied patches by Phillie (windows exe improvement, linking order)
-  * updated Mongolian
-  * made M.A.R.S. work with the recent version of SFML
-  * added Dutch translation
-  * fixed KeyEdit
-  * added H2-OMG
-  * added shocker texture
-  * changed some code to make it work with the most recent version of SFML2
-  * Added Bolt and H2OMG and their textures
-  * Updated translations and balanced weapons
-  * Added Dutch translation
+  * fixed _all_ bugs of 0.7.3
+  * updated revision number and version number in menus
 
- -- Simon Schneegans <josi.schneegans@vr-web.de>  Wed, 05 Oct 2011 10:24:38 +0200
+ -- Simon Schneegans <josi.schneegans@vr-web.de>  Sun, 09 Oct 2011 14:08:32 +0200
 
diff -Nru marsshooter-0.7/include/defines.hpp marsshooter-0.7/include/defines.hpp
--- marsshooter-0.7/include/defines.hpp	2011-10-04 23:00:47.000000000 +0000
+++ marsshooter-0.7/include/defines.hpp	2011-10-09 11:46:27.000000000 +0000
@@ -20,8 +20,8 @@
 
 # define VERSION_MAJOR               "0"
 # define VERSION_MINOR               "7"
-# define VERSION_PATCH               "3"
-# define VERSION_REVIS               "213"
+# define VERSION_PATCH               "4"
+# define VERSION_REVIS               "215"
 
 # define SHIP_GRAPHICS_COUNT         15
 # define SHIP_RADIUS                 18.f
diff -Nru marsshooter-0.7/include/SpaceObjects/Ship.hpp marsshooter-0.7/include/SpaceObjects/Ship.hpp
--- marsshooter-0.7/include/SpaceObjects/Ship.hpp	2011-10-04 22:08:26.000000000 +0000
+++ marsshooter-0.7/include/SpaceObjects/Ship.hpp	2011-10-09 11:21:12.000000000 +0000
@@ -42,7 +42,7 @@
         void onShockWave(Player* damageSource, float intensity);
 
         void setDamageSource(Player* evilOne);
-        void drainLife(Player* source, int amount, Vector2f const& direction, float waitForOtherDamage = 0.001f);
+        void drainLife(Player* source, float amount, Vector2f const& direction, float waitForOtherDamage = 0.001f);
 
         void heal(Player* source, int amount);
         void refuel(Player* source, int amount);
diff -Nru marsshooter-0.7/include/Specials/Shocker.hpp marsshooter-0.7/include/Specials/Shocker.hpp
--- marsshooter-0.7/include/Specials/Shocker.hpp	2011-10-04 22:08:26.000000000 +0000
+++ marsshooter-0.7/include/Specials/Shocker.hpp	2011-10-09 11:21:12.000000000 +0000
@@ -30,7 +30,7 @@
     public:
         /// Ctor which constructs the special.
         Shocker(Ship* parent):
-              Special(specials::sBlast, parent, sf::String("SHOCKER")) {};
+              Special(specials::sShocker, parent, sf::String("SHOCKER")) {};
 
         /// Blasts away nearby ships.
         void activate() const;
diff -Nru marsshooter-0.7/src/Particles/AmmoBurner.cpp marsshooter-0.7/src/Particles/AmmoBurner.cpp
--- marsshooter-0.7/src/Particles/AmmoBurner.cpp	2011-05-15 13:50:36.000000000 +0000
+++ marsshooter-0.7/src/Particles/AmmoBurner.cpp	2011-10-09 11:21:12.000000000 +0000
@@ -80,30 +80,6 @@
 
 void AmmoBurner::onCollision(SpaceObject* with, Vector2f const& location,
                         Vector2f const& direction, Vector2f const& velocity) {
-    float strength = (velocity-velocity_).length();
-
-    if (strength > 50.f) {
-
-        switch (with->type()) {
-            case spaceObjects::oShip:
-                sound::playSound(sound::LaserCollide, location, (strength-50)/3);
-                break;
-
-            case spaceObjects::oBall:
-                sound::playSound(sound::LaserCollide, location, (strength-50)/3);
-                break;
-
-            case spaceObjects::oPlanet: case spaceObjects::oHome:
-                sound::playSound(sound::LaserCollide, location, (strength-50)/3);
-                break;
-
-            case spaceObjects::oSun:
-                sound::playSound(sound::LaserCollide, location, (strength-50)/3);
-                break;
-
-            default:;
-        }
-    }
     killMe();
 }
 
diff -Nru marsshooter-0.7/src/SpaceObjects/Ship.cpp marsshooter-0.7/src/SpaceObjects/Ship.cpp
--- marsshooter-0.7/src/SpaceObjects/Ship.cpp	2011-10-04 22:08:26.000000000 +0000
+++ marsshooter-0.7/src/SpaceObjects/Ship.cpp	2011-10-09 11:21:12.000000000 +0000
@@ -514,8 +514,8 @@
     }
 }
 
-void Ship::drainLife(Player* source, int amount, Vector2f const& direction, float waitForOtherDamage) {
-    if (dynamic_cast<LocalPlayer*>(source) != NULL) {
+void Ship::drainLife(Player* source, float amount, Vector2f const& direction, float waitForOtherDamage) {
+    if (dynamic_cast<LocalPlayer*>(source) != NULL || dynamic_cast<LocalPlayer*>(owner_) != NULL) {
         if (damageCheckTimer_ <= 0.f)
             damageCheckTimer_ = waitForOtherDamage;
         damageByLocalPlayer_ -= amount;