From c94b1f22ab5d1522abfcedef8cf3a62848c370c1 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Tue, 23 Sep 2008 14:38:13 +0000 Subject: added non-hookable tile --- src/game/server/entities/character.cpp | 1 + src/game/server/hooks.cpp | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/game/server') 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; - } } } -- cgit 1.4.1