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

hit ding sound now in

Browse source
This commit is contained in:
Jakob Fries 2007-08-04 17:28:31 +00:00
parent 45725726c1
commit ee2ff62378
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
datasrc/teewars.ds
View file

@ -160,6 +160,11 @@ sounds {
"data/audio/wp_noammo-04.wav"
"data/audio/wp_noammo-05.wav"
}
hit {
"data/audio/sfx_hit_strong-01.wav"
"data/audio/sfx_hit_strong-02.wav"
}
}

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

@ -34,6 +34,7 @@ void create_smoke(vec2 p);
void create_spawn(vec2 p);
void create_death(vec2 p);
void create_sound(vec2 pos, int sound, int loopflags = 0);
void create_targetted_sound(vec2 pos, int sound, int target, int loopflags = 0);
class player *intersect_player(vec2 pos0, vec2 pos1, vec2 &new_pos, class entity *notthis = 0);
template<typename T>
@ -133,12 +134,13 @@ event_handler::event_handler()
clear();
}
void *event_handler::create(int type, int size)
void *event_handler::create(int type, int size, int target)
{
void *p = &data[current_offset];
offsets[num_events] = current_offset;
types[num_events] = type;
sizes[num_events] = size;
targets[num_events] = target;
current_offset += size;
num_events++;
return p;
@ -153,10 +155,13 @@ void event_handler::clear()
void event_handler::snap(int snapping_client)
{
for(int i = 0; i < num_events; i++)
{
if (targets[i] == -1 || targets[i] == snapping_client)
{
void *d = snap_new_item(types[i], i, sizes[i]);
mem_copy(d, &data[offsets[i]], sizes[i]);
}
}
}
event_handler events;
@ -556,8 +561,12 @@ void projectile::tick()
if (flags & PROJECTILE_FLAGS_EXPLODE)
create_explosion(oldpos, owner, weapon, false);
else if (targetplayer)
{
targetplayer->take_damage(normalize(vel) * max(0.001f, force), damage, owner, weapon);
create_targetted_sound(pos, SOUND_HIT, owner);
}
world.destroy_entity(this);
}
}
@ -1684,18 +1693,23 @@ void create_death(vec2 p)
ev->y = (int)p.y;
}
void create_sound(vec2 pos, int sound, int loopingflags)
void create_targetted_sound(vec2 pos, int sound, int target, int loopingflags)
{
if (sound < 0)
return;
// create a sound
ev_sound *ev = (ev_sound *)events.create(EVENT_SOUND, sizeof(ev_sound));
ev_sound *ev = (ev_sound *)events.create(EVENT_SOUND, sizeof(ev_sound), target);
ev->x = (int)pos.x;
ev->y = (int)pos.y;
ev->sound = sound | loopingflags;
}
void create_sound(vec2 pos, int sound, int loopingflags)
{
create_targetted_sound(pos, sound, -1, loopingflags);
}
// TODO: should be more general
player* intersect_player(vec2 pos0, vec2 pos1, vec2& new_pos, entity* notthis)
{

3
src/game/server/game_server.h
View file

@ -8,13 +8,14 @@ class event_handler
int types[MAX_EVENTS]; // TODO: remove some of these arrays
int offsets[MAX_EVENTS];
int sizes[MAX_EVENTS];
int targets[MAX_EVENTS];
char data[MAX_DATASIZE];
int current_offset;
int num_events;
public:
event_handler();
void *create(int type, int size);
void *create(int type, int size, int target = -1);
void clear();
void snap(int snapping_client);
};