diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-23 14:38:13 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-23 14:38:13 +0000 |
| commit | c94b1f22ab5d1522abfcedef8cf3a62848c370c1 (patch) | |
| tree | 4eb58340a78bd605d722d951b307bf1a7b476b2c /src/game/server | |
| parent | 815c55c4ce58995dcc34627bcbed956d1a1bc4dd (diff) | |
| download | zcatch-c94b1f22ab5d1522abfcedef8cf3a62848c370c1.tar.gz zcatch-c94b1f22ab5d1522abfcedef8cf3a62848c370c1.zip | |
added non-hookable tile
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/entities/character.cpp | 1 | ||||
| -rw-r--r-- | src/game/server/hooks.cpp | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 05820102..8f47fbe7 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -657,6 +657,7 @@ void CHARACTER::tick_defered() //if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos); if(events&COREEVENT_HOOK_ATTACH_PLAYER) game.create_sound(pos, SOUND_HOOK_ATTACH_PLAYER, cmask_all()); if(events&COREEVENT_HOOK_ATTACH_GROUND) game.create_sound(pos, SOUND_HOOK_ATTACH_GROUND, mask); + if(events&COREEVENT_HOOK_HIT_NOHOOK) game.create_sound(pos, SOUND_HOOK_LOOP, mask); //if(events&COREEVENT_HOOK_RETRACT) snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos); //} diff --git a/src/game/server/hooks.cpp b/src/game/server/hooks.cpp index bd2b5f4f..3b16c422 100644 --- a/src/game/server/hooks.cpp +++ b/src/game/server/hooks.cpp @@ -359,15 +359,6 @@ void mods_init() vec2 pos(x*32.0f+16.0f, y*32.0f+16.0f); game.controller->on_entity(index-ENTITY_OFFSET, pos); } - else - { - if(index == TILE_DEATH) - tiles[y*tmap->width+x].index = COLFLAG_DEATH; - else if(index == TILE_SOLID) - tiles[y*tmap->width+x].index = COLFLAG_SOLID; - else - tiles[y*tmap->width+x].index = 0; - } } } |