From 35bcd41aa281325112dd09f12dce89236cca937d Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Fri, 17 Oct 2008 11:23:21 +0000 Subject: added hammer hit effect. added reset of all systems on state change. solves a lot of possible memory errors --- src/game/client/components/effects.cpp | 17 +++++++++++++++++ src/game/client/components/effects.hpp | 1 + 2 files changed, 18 insertions(+) (limited to 'src/game/client/components') diff --git a/src/game/client/components/effects.cpp b/src/game/client/components/effects.cpp index 282da6f8..5e2e25e3 100644 --- a/src/game/client/components/effects.cpp +++ b/src/game/client/components/effects.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "effects.hpp" @@ -215,6 +216,22 @@ void EFFECTS::explosion(vec2 pos) } } + +void EFFECTS::hammerhit(vec2 pos) +{ + // add the explosion + PARTICLE p; + p.set_default(); + p.spr = SPRITE_PART_EXPL01; + p.pos = pos; + p.life_span = 0.4f; + p.start_size = 150.0f; + p.end_size = 0; + p.rot = frandom()*pi*2; + gameclient.particles->add(PARTICLES::GROUP_EXPLOSIONS, &p); + gameclient.sounds->play(SOUNDS::CHN_WORLD, SOUND_HAMMER_HIT, 1.0f, pos); +} + void EFFECTS::on_render() { static int64 last_update_100hz = 0; diff --git a/src/game/client/components/effects.hpp b/src/game/client/components/effects.hpp index 13af8947..8574bf60 100644 --- a/src/game/client/components/effects.hpp +++ b/src/game/client/components/effects.hpp @@ -13,6 +13,7 @@ public: void smoketrail(vec2 pos, vec2 vel); void skidtrail(vec2 pos, vec2 vel); void explosion(vec2 pos); + void hammerhit(vec2 pos); void air_jump(vec2 pos); void damage_indicator(vec2 pos, vec2 dir); void playerspawn(vec2 pos); -- cgit 1.4.1