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

added switch and noammo sounds. ingame chat works more intuitively (sp?)

Browse source
This commit is contained in:
Jakob Fries 2007-08-04 16:49:57 +00:00
parent 04ab18c37c
commit 9f35dfa5db
3 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
datasrc/teewars.ds
View file

@ -152,6 +152,14 @@ sounds {
"data/audio/sfx_spawn_wpn-02.wav"
"data/audio/sfx_spawn_wpn-03.wav"
}
weapon_noammo {
"data/audio/wp_noammo-01.wav"
"data/audio/wp_noammo-02.wav"
"data/audio/wp_noammo-03.wav"
"data/audio/wp_noammo-04.wav"
"data/audio/wp_noammo-05.wav"
}
}

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

@ -1202,7 +1202,10 @@ void modc_render()
if (inp_key_down(input::esc))
{
menu_active = !menu_active;
if (chat_active)
chat_active = false;
else
menu_active = !menu_active;
}
if (!menu_active)
@ -1556,12 +1559,6 @@ void modc_render()
y += 44;
}
}
if (menu_active)
{
ingamemenu_render();
return;
}
// render chat
{
@ -1592,6 +1589,12 @@ void modc_render()
}
}
if (menu_active)
{
ingamemenu_render();
return;
}
// render goals
if(gameobj)
{

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

@ -877,7 +877,13 @@ int player::handle_weapons()
// switch weapon if wanted
if(input.activeweapon >= 0 && input.activeweapon < NUM_WEAPONS && weapons[input.activeweapon].got &&
data->weapons[active_weapon].duration <= 0)
{
if (active_weapon != input.activeweapon)
create_sound(pos, SOUND_WEAPON_SWITCH);
active_weapon = input.activeweapon;
}
if(!previnput.fire && input.fire)
{
@ -917,6 +923,7 @@ int player::handle_weapons()
case WEAPON_SHOTGUN:
{
int shotspread = min(2, weapons[active_weapon].ammo);
weapons[active_weapon].ammo -= shotspread - 1; // one will be taken later
for(int i = -shotspread; i <= shotspread; i++)
{
float a = get_angle(direction);
@ -942,14 +949,13 @@ int player::handle_weapons()
break;
}
weapons[active_weapon].ammo -= max(1, weapons[active_weapon].ammocost);
weapons[active_weapon].ammo--;
attack_tick = server_tick();
reload_timer = data->weapons[active_weapon].firedelay * server_tickspeed() / 1000;
}
else
{
// click!!! click
// TODO: make sound here
create_sound(pos, SOUND_WEAPON_NOAMMO);
}
}
}