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

renamed laser to rifle.

Browse source
This commit is contained in:
Magnus Auvinen 2008-02-04 07:59:25 +00:00
parent dd1e7adc00
commit da2d792186
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
datasrc/teewars.ds
View file

@ -11,7 +11,7 @@ sounds {
"data/audio/wp_shotty_fire-03.wv"
}
laser_fire {
rifle_fire {
"data/audio/wp_shotty_fire-01.wv"
"data/audio/wp_shotty_fire-02.wv"
"data/audio/wp_shotty_fire-03.wv"
@ -374,9 +374,9 @@ weapons {
velocity 0
}
laser {
sprite_body sprites.game.weapon_laser_body
sprite_cursor sprites.game.weapon_laser_cursor
rifle {
sprite_body sprites.game.weapon_rifle_body
sprite_cursor sprites.game.weapon_rifle_cursor
sprite_proj sprites.game.weapon_shotgun_proj
sprite_muzzles {
}
@ -386,7 +386,7 @@ weapons {
muzzleoffsety 0.0
maxammo 10
recoil 10
firedelay 600
firedelay 800
muzzleduration 0
visual_size 128
offsetx 24.0
@ -491,8 +491,8 @@ sprites {
weapon_ninja_cursor 0 10 2 2
weapon_ninja_proj 0 0 0 0
weapon_laser_body 2 12 9 3
weapon_laser_cursor 0 12 2 2
weapon_rifle_body 2 12 9 3
weapon_rifle_cursor 0 12 2 2
hook_chain 2 0 1 1
hook_head 3 0 2 1

1
src/game/client/gc_menu.cpp
View file

@ -1300,6 +1300,7 @@ static void menu2_render_settings_controls(RECT main_view)
{ "Pistol:", &config.key_weapon2 },
{ "Shotgun:", &config.key_weapon3 },
{ "Grenade:", &config.key_weapon4 },
{ "Rifle:", &config.key_weapon5 },
{ "Next Weapon:", &config.key_next_weapon },
{ "Prev. Weapon:", &config.key_prev_weapon },
{ "Emoticon:", &config.key_emoticon },

10
src/game/server/gs_server.cpp
View file

@ -482,7 +482,7 @@ bool laser::hit_player(vec2 from, vec2 to)
this->from = from;
pos = at;
energy = -1;
hit->take_damage(vec2(0,0), tuning.laser_damage, owner->client_id, WEAPON_LASER);
hit->take_damage(vec2(0,0), tuning.laser_damage, owner->client_id, WEAPON_RIFLE);
return true;
}
@ -818,8 +818,8 @@ void player::try_respawn()
weapons[WEAPON_GUN].got = true;
weapons[WEAPON_GUN].ammo = data->weapons[WEAPON_GUN].maxammo;
weapons[WEAPON_LASER].got = true;
weapons[WEAPON_LASER].ammo = 100000; //data->weapons[WEAPON_LASER].maxammo;
weapons[WEAPON_RIFLE].got = true;
weapons[WEAPON_RIFLE].ammo = 100000; //data->weapons[WEAPON_LASER].maxammo;
active_weapon = WEAPON_GUN;
last_weapon = WEAPON_HAMMER;
@ -1078,10 +1078,10 @@ int player::handle_weapons()
break;
}
case WEAPON_LASER:
case WEAPON_RIFLE:
{
new laser(pos, direction, tuning.laser_reach, this);
create_sound(pos, SOUND_LASER_FIRE);
create_sound(pos, SOUND_RIFLE_FIRE);
break;
}