# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1304772004 -7200
# Node ID 83569a6b3ad8a14e323091408d2d86deac6e9958
# Parent  65881746dc2031544788feb5c9e65a88686275f5
Fix StartingDoorway and velocity clamping.

diff -r 65881746dc20 -r 83569a6b3ad8 skaapsteker/physics.py
--- a/skaapsteker/physics.py	Sat May 07 13:59:00 2011 +0200
+++ b/skaapsteker/physics.py	Sat May 07 14:40:04 2011 +0200
@@ -54,11 +54,10 @@
 
 
     def deltav(self, dv):
-        velocity = cadd(self.velocity, dv)
-        self.velocity = cclamp(velocity, self.terminal_velocity)
-
+        self.velocity = cadd(self.velocity, dv)
 
     def deltap(self, dt):
+        self.velocity = cclamp(self.velocity, self.terminal_velocity)
         old_pos = self.rect.center
         self._float_pos = cadd(self._float_pos, cmul(self.velocity, dt))
         self.rect.center = cint(self._float_pos)
diff -r 65881746dc20 -r 83569a6b3ad8 skaapsteker/sprites/base.py
--- a/skaapsteker/sprites/base.py	Sat May 07 13:59:00 2011 +0200
+++ b/skaapsteker/sprites/base.py	Sat May 07 14:40:04 2011 +0200
@@ -437,6 +437,9 @@
 
     image_file = 'torii.png'
 
+    def __init__(self, pos, **opts):
+        super(Doorway, self).__init__(pos, **opts)
+        self.tile_pos = pos
 
     def setup_image_data(self, pos, **opts):
         super(Doorway, self).setup_image_data(pos, **opts)
@@ -444,16 +447,17 @@
         self.rect = self.image.get_rect(midbottom=self.rect.midbottom)
         self.collide_rect = self.rect
 
-
     def setup(self, facing, leadsto):
         self.facing = facing
         self.leadsto = leadsto
 
-
     def player_action(self, player):
         from .. import engine, levelscene
         engine.ChangeScene.post((levelscene.LevelScene, self.leadsto))
 
+    def get_tile_pos(self):
+        return self.tile_pos
+
 
 
 class CelestialDoorway(Doorway):
@@ -476,7 +480,10 @@
 
 
     def setup(self, facing):
-        Doorway.setup(self, facing, None)
+        super(StartingDoorway, self).setup(facing, None)
+
+    def player_action(self, player):
+        pass
 
 
 class Skeleton(GameSprite):