diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-05-29 12:53:33 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-29 12:53:33 -0500 |
| commit | 02f19d1fa7c8525327d7bd181d058af684c611d3 (patch) | |
| tree | 3b247a31a891374724159cab90eaf4a7ed47eaba /src/topman.cpp | |
| parent | 7dd63b2700ff841a760abdcfb78d444eddb47ac9 (diff) | |
| parent | 8e3ed036b676b645886c127da2b40760b64377ee (diff) | |
| download | kamek-02f19d1fa7c8525327d7bd181d058af684c611d3.tar.gz kamek-02f19d1fa7c8525327d7bd181d058af684c611d3.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to 'src/topman.cpp')
| -rw-r--r-- | src/topman.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/topman.cpp b/src/topman.cpp index 5d98761..854edc2 100644 --- a/src/topman.cpp +++ b/src/topman.cpp @@ -157,7 +157,8 @@ daTopman *daTopman::build() { bool daTopman::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { backFire = apOther->owner->direction ^ 1; - doStateChange(&StateID_KnockBack); + // doStateChange(&StateID_KnockBack); + doStateChange(&StateID_Die); return true; } |