diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-02-04 07:59:25 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-02-04 07:59:25 +0000 |
| commit | da2d792186d53794d25438c157ac039adbb8c1a6 (patch) | |
| tree | f1b03e5fc42a0106c749a9ff817b1d8372fc8d71 | |
| parent | dd1e7adc00b8020fd163a051a6fc6109eeca332b (diff) | |
| download | zcatch-da2d792186d53794d25438c157ac039adbb8c1a6.tar.gz zcatch-da2d792186d53794d25438c157ac039adbb8c1a6.zip | |
renamed laser to rifle.
| -rw-r--r-- | datasrc/teewars.ds | 14 | ||||
| -rw-r--r-- | src/game/client/gc_menu.cpp | 1 | ||||
| -rw-r--r-- | src/game/server/gs_server.cpp | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds index 67b67195..860700b4 100644 --- a/datasrc/teewars.ds +++ b/datasrc/teewars.ds @@ -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 diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp index fb39f85f..409edbe8 100644 --- a/src/game/client/gc_menu.cpp +++ b/src/game/client/gc_menu.cpp @@ -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 }, diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index 41dc18a3..b9f78996 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -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; } |