diff options
| author | Treeki <treeki@gmail.com> | 2013-06-02 23:32:09 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-06-02 23:32:09 +0200 |
| commit | e33d76475bc5326d608e74421c8e3a40ae0f4e2e (patch) | |
| tree | 2798b85a822f5fbe375fc1369b1fd7396647aa5c /src/bossSamurshai.cpp | |
| parent | 330d88af1b6d8415bb6bfc27a3882686f2d9555f (diff) | |
| parent | f4526064654ad2ed884e63eb633babda523d73cd (diff) | |
| download | kamek-e33d76475bc5326d608e74421c8e3a40ae0f4e2e.tar.gz kamek-e33d76475bc5326d608e74421c8e3a40ae0f4e2e.zip | |
FUCKING CRAP MERGES
Diffstat (limited to '')
| -rw-r--r-- | src/bossSamurshai.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp index ba871cd..5edb17d 100644 --- a/src/bossSamurshai.cpp +++ b/src/bossSamurshai.cpp @@ -110,7 +110,8 @@ daSamurshai *daSamurshai::build() { //////////////////////// void ChucksAndKnucks(ActivePhysics *apThis, ActivePhysics *apOther) { - ((dEn_c*)apThis->owner)->_vf220(apOther->owner); + if (((dEn_c*)apOther->owner)->name == PLAYER) + ((dEn_c*)apThis->owner)->_vf220(apOther->owner); } void daSamurshai::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther) { |