diff options
author | nrp <olpc@spongezone.net> | 2008-08-31 18:20:37 (GMT) |
---|---|---|
committer | nrp <olpc@spongezone.net> | 2008-08-31 18:20:37 (GMT) |
commit | 621ffa66628afe5543ce6dff3d7e676e6d92ede8 (patch) | |
tree | 677d2b347f06ae6a26fcb8c1e7b115fe1b387f52 /tools.py | |
parent | bce2e832c2664e9d5a9f8988da92e6d6f8d4f000 (diff) | |
parent | 5ccc3b13a26f23c93342f55fd6b1a6992e164c92 (diff) |
Merge branch 'master' of git+ssh://physics03@dev.laptop.org/git/projects/physics03
Conflicts:
bridge.py
tools.py
Diffstat (limited to 'tools.py')
-rw-r--r-- | tools.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -37,7 +37,7 @@ class Tool(object): self.game.bridge.create_train() self.game.world.run_physics = not self.game.world.run_physics elif event.key == K_t: - self.game.bridge.create_train() + self.game.bridge.create_train(force=True) elif event.key == K_b: self.game.setTool("box") elif event.key == K_c: @@ -293,7 +293,7 @@ class BridgeJointTool(Tool): if event.pos[1] > 550 and (event.pos[0] < 350 or event.pos[0] > 850): jointDef.Initialize(self.game.world.world.GetGroundBody(), bodies[0], self.to_b2vec(event.pos)) - else: + elif len(bodies) == 2: if bodies[0].IsStatic(): jointDef.Initialize(self.game.world.world.GetGroundBody(), bodies[1], self.to_b2vec(event.pos)) |