edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed so that the airjump effect is shown to all

Browse source
This commit is contained in:
Magnus Auvinen 2007-12-09 16:04:37 +00:00
parent 20e390ade2
commit 7f95a8d4a6
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/game/client/game_client.cpp
View file

@ -507,6 +507,17 @@ static int killmsg_current = 0;
extern unsigned char internal_data[]; extern unsigned char internal_data[];
void create_air_jump_effect(vec2 pos)
{
const int count = 12;
for(int i = 0; i <= count; i++)
{
float a = i/(float)count;
vec2 v = vec2((a-0.5f)*512.0f, 0);
temp_system.new_particle(pos+vec2(0,28), v, 0.4f, 16.0f, 0, 0.985f, vec4(0.25f,0.4f,1,1));
}
}
extern void draw_round_rect(float x, float y, float w, float h, float r); extern void draw_round_rect(float x, float y, float w, float h, float r);
extern int render_popup(const char *caption, const char *text, const char *button_text); extern int render_popup(const char *caption, const char *text, const char *button_text);
@ -613,6 +624,11 @@ static void process_events(int s)
ev_damageind *ev = (ev_damageind *)data; ev_damageind *ev = (ev_damageind *)data;
damageind.create(vec2(ev->x, ev->y), get_direction(ev->angle)); damageind.create(vec2(ev->x, ev->y), get_direction(ev->angle));
} }
else if(item.type == EVENT_AIR_JUMP)
{
ev_common *ev = (ev_common *)data;
create_air_jump_effect(vec2(ev->x, ev->y));
}
else if(item.type == EVENT_EXPLOSION) else if(item.type == EVENT_EXPLOSION)
{ {
ev_explosion *ev = (ev_explosion *)data; ev_explosion *ev = (ev_explosion *)data;
@ -806,14 +822,7 @@ extern "C" void modc_predict()
if(events&COREEVENT_GROUND_JUMP) snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos); if(events&COREEVENT_GROUND_JUMP) snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos);
if(events&COREEVENT_AIR_JUMP) if(events&COREEVENT_AIR_JUMP)
{ {
const int count = 12; create_air_jump_effect(pos);
for(int i = 0; i <= count; i++)
{
float a = i/(float)count;
vec2 v = vec2((a-0.5f)*512.0f, 0);
temp_system.new_particle(pos+vec2(0,28), v, 0.4f, 16.0f, 0, 0.985f, vec4(0.25f,0.4f,1,1));
}
snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos); snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos);
} }
//if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos); //if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos);

1
src/game/game_protocol.h
View file

@ -35,6 +35,7 @@ enum
EVENT_SMOKE, EVENT_SMOKE,
EVENT_SPAWN, EVENT_SPAWN,
EVENT_DEATH, EVENT_DEATH,
EVENT_AIR_JUMP,
EVENT_DUMMY EVENT_DUMMY
}; };

9
src/game/server/game_server.cpp
View file

@ -985,7 +985,14 @@ void player::tick_defered()
int mask = cmask_all_except_one(client_id); int mask = cmask_all_except_one(client_id);
if(events&COREEVENT_GROUND_JUMP) create_sound(pos, SOUND_PLAYER_JUMP, mask); if(events&COREEVENT_GROUND_JUMP) create_sound(pos, SOUND_PLAYER_JUMP, mask);
if(events&COREEVENT_AIR_JUMP) create_sound(pos, SOUND_PLAYER_JUMP, mask); if(events&COREEVENT_AIR_JUMP)
{
create_sound(pos, SOUND_PLAYER_JUMP, mask);
ev_common *c = (ev_common *)::events.create(EVENT_AIR_JUMP, sizeof(ev_common), mask);
c->x = (int)pos.x;
c->y = (int)pos.y;
}
//if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos); //if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos);
if(events&COREEVENT_HOOK_ATTACH_PLAYER) create_sound(pos, SOUND_HOOK_ATTACH_PLAYER, mask); if(events&COREEVENT_HOOK_ATTACH_PLAYER) create_sound(pos, SOUND_HOOK_ATTACH_PLAYER, mask);
if(events&COREEVENT_HOOK_ATTACH_GROUND) create_sound(pos, SOUND_HOOK_ATTACH_GROUND, mask); if(events&COREEVENT_HOOK_ATTACH_GROUND) create_sound(pos, SOUND_HOOK_ATTACH_GROUND, mask);