From ea791bd712b840dda6ef178cbc0258b501b57653 Mon Sep 17 00:00:00 2001 From: vermeulenl Date: Sat, 7 Feb 2004 01:35:34 +0000 Subject: [PATCH] problems with caps and unix git-svn-id: svn://svn.icculus.org/nexuiz/trunk@126 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- qcsrc/func.qc | 8 ++++---- qcsrc/items.qc | 4 ++-- qcsrc/teleporters.qc | 4 ++-- qcsrc/weapons.qc | 34 +++++++++++++++++----------------- qcsrc/worldspawn.qc | 38 +++++++++++++++++++------------------- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/qcsrc/func.qc b/qcsrc/func.qc index b3c9eff3f..c279a777a 100644 --- a/qcsrc/func.qc +++ b/qcsrc/func.qc @@ -337,23 +337,23 @@ void ImpactEffect (entity ent, float weapontype) { te_explosion (org2); effect (org2, "models/sprites/dpexplosion1.spr32", 0, 20, 40); - sound (ent, CHAN_BODY, "weapons/Rocket_Impact.wav", 1, ATTN_NORM); + sound (ent, CHAN_BODY, "weapons/rocket_impact.wav", 1, ATTN_NORM); } else if (weapontype == IT_GRENADE_LAUNCHER) { te_explosion (org2); effect (org2, "models/sprites/dpexplosion1.spr32", 0, 20, 30); - sound (ent, CHAN_BODY, "weapons/Grenade_Impact.wav", 1, ATTN_NORM); + sound (ent, CHAN_BODY, "weapons/grenade_impact.wav", 1, ATTN_NORM); } else if (weapontype == IT_HAGAR) { effect (org2, "models/sprites/dpexplosion2.spr32", 0, 20, 30); - sound (ent, CHAN_BODY, "weapons/Rocket_Impact.wav", 1, ATTN_NORM); + sound (ent, CHAN_BODY, "weapons/rocket_impact.wav", 1, ATTN_NORM); } else if (weapontype == IT_ELECTRO) // Secondary fire { effect (org2, "models/sprites/plasmahitwall.spr32", 0, 20, 50); - sound (ent, CHAN_BODY, "weapons/Plasma_Hit.wav", 1, ATTN_NORM); + sound (ent, CHAN_BODY, "weapons/plasma_hit.wav", 1, ATTN_NORM); } } diff --git a/qcsrc/items.qc b/qcsrc/items.qc index 46694112c..97c53364a 100644 --- a/qcsrc/items.qc +++ b/qcsrc/items.qc @@ -3,7 +3,7 @@ void Item_Respawn (void) { self.model = self.mdl; // restore original model self.solid = SOLID_TRIGGER; // allow it to be touched again - sound (self, CHAN_VOICE, "misc/ItemRespawn.wav", 1, ATTN_NORM); // play respawn sound + sound (self, CHAN_VOICE, "misc/itemrespawn.wav", 1, ATTN_NORM); // play respawn sound setorigin (self, self.origin); } @@ -58,7 +58,7 @@ void Item_Touch (void) self = oldself; - sound (self, CHAN_BODY, "weapons/WeaponPickup.wav", 1, ATTN_NORM); + sound (self, CHAN_BODY, "weapons/weaponpickup.wav", 1, ATTN_NORM); if (self.norespawn) { diff --git a/qcsrc/teleporters.qc b/qcsrc/teleporters.qc index 6a9be9456..f48bbdbcc 100644 --- a/qcsrc/teleporters.qc +++ b/qcsrc/teleporters.qc @@ -7,7 +7,7 @@ void Teleport_Touch (void) return; // Make teleport effect where the player left - sound (other, CHAN_ITEM, "misc/Teleport.wav", 1, ATTN_NORM); + sound (other, CHAN_ITEM, "misc/teleport.wav", 1, ATTN_NORM); te_teleport (other.origin); dest = find (world, targetname, self.target); @@ -15,7 +15,7 @@ void Teleport_Touch (void) objerror ("Teleporter with nonexistant target"); // Make teleport effect where the player arrived - sound (other, CHAN_ITEM, "misc/Teleport.wav", 1, ATTN_NORM); + sound (other, CHAN_ITEM, "misc/teleport.wav", 1, ATTN_NORM); makevectors (dest.mangle); te_teleport (dest.origin + v_forward * 32); diff --git a/qcsrc/weapons.qc b/qcsrc/weapons.qc index e8463e515..ecbf03a97 100644 --- a/qcsrc/weapons.qc +++ b/qcsrc/weapons.qc @@ -388,9 +388,9 @@ void fireBullet (vector dir, float spread, float damage, float dtype) te_blood (trace_endpos, dir * damage * 16, damage); Damage (self, trace_endpos, trace_ent, 0, damage, dir * damage); if (random () < 0.5) - sound (trace_ent, CHAN_IMPACT, "misc/BodyImpact1.wav", 1, ATTN_NORM); + sound (trace_ent, CHAN_IMPACT, "misc/bodyimpact1.wav", 1, ATTN_NORM); else - sound (trace_ent, CHAN_IMPACT, "misc/BodyImpact2.wav", 1, ATTN_NORM); + sound (trace_ent, CHAN_IMPACT, "misc/bodyimpact2.wav", 1, ATTN_NORM); } } } @@ -428,7 +428,7 @@ void W_Laser_Attack (void) { entity missile; - sound (self, CHAN_WEAPON, "weapons/Electro_fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/electro_fire.wav", 1, ATTN_NORM); missile = spawn (); missile.owner = self; @@ -476,7 +476,7 @@ void W_Laser_Attack2 (void) void W_Uzi_Attack (void) { - sound (self, CHAN_WEAPON, "weapons/Uzi_Fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/uzi_Fire.wav", 1, ATTN_NORM); fireBullet (v_forward, 100, 6, IT_UZI); @@ -496,7 +496,7 @@ void W_Uzi_Attack2 (void) float sc; float bullets; - sound (self, CHAN_WEAPON, "weapons/Shotgun_fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/shotgun_fire.wav", 1, ATTN_NORM); if (self.ammo_nails<8) bullets = self.ammo_nails; @@ -547,14 +547,14 @@ void W_Grenade_Touch (void) //if (other.classname == "player" || other.classname == "corpse") // W_Grenade_Explode (other); //else - sound (self, CHAN_BODY, "weapons/Grenade_Bounce.wav", 1, ATTN_NORM); + sound (self, CHAN_BODY, "weapons/grenade_Bounce.wav", 1, ATTN_NORM); } void W_Grenade_Attack (void) { entity gren; - sound (self, CHAN_WEAPON, "weapons/Grenade_fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/grenade_fire.wav", 1, ATTN_NORM); self.punchangle_x = -4; @@ -584,7 +584,7 @@ void W_Grenade_Attack (void) gren.think = W_Grenade_FuseExplode; gren.nextthink = time + 5; - self.attack_finished = time + 1; + self.attack_finished = time + 0.8; self.ammo_rockets = self.ammo_rockets - 1; } @@ -625,7 +625,7 @@ void W_Electro_Attack (float postion) { entity proj; - sound (self, CHAN_WEAPON, "weapons/Electro_fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/electro_fire.wav", 1, ATTN_NORM); proj = spawn (); proj.owner = self; @@ -651,7 +651,7 @@ void W_Electro_Attack (float postion) proj.think = SUB_Remove; proj.nextthink = time + 3; - self.attack_finished = time + 0.2; + self.attack_finished = time + 0.4; self.ammo_cells = self.ammo_cells - 1; } @@ -682,14 +682,14 @@ void W_Plasma_Touch (void) if (other.classname == "player" || other.classname == "corpse") W_Plasma_Explode (other); else - sound (self, CHAN_BODY, "weapons/Grenade_Bounce.wav", 1, ATTN_NORM); + sound (self, CHAN_BODY, "weapons/grenade_Bounce.wav", 1, ATTN_NORM); } void W_Electro_Attack2 (void) { entity Plasma; - sound (self, CHAN_WEAPON, "weapons/Electro_fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/electro_fire.wav", 1, ATTN_NORM); self.punchangle_x = -4; @@ -778,7 +778,7 @@ void W_Nex_Attack (void) vector org; vector dir; - sound (self, CHAN_WEAPON, "weapons/NexFire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/nexfire.wav", 1, ATTN_NORM); //self.effects = EF_MUZZLEFLASH; self.punchangle_x = -4; @@ -855,7 +855,7 @@ void W_Hagar_Attack (void) entity missile; vector org; - sound (self, CHAN_WEAPON, "weapons/Hagar_Fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM); missile = spawn (); missile.owner = self; @@ -891,7 +891,7 @@ void W_Hagar_Attack2 (void) { entity missle; - sound (self, CHAN_WEAPON, "weapons/Hagar_Fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM); missle = spawn (); missle.owner = self; @@ -950,7 +950,7 @@ void W_Rocket_Attack (void) entity missile; vector org; - sound (self, CHAN_WEAPON, "weapons/Rocket_Fire.wav", 1, ATTN_NORM); + sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", 1, ATTN_NORM); missile = spawn (); missile.owner = self; @@ -1010,7 +1010,7 @@ void W_Rocket_Attack2 (void) entity missile; vector org; - //sound (self, CHAN_WEAPON, "weapons/Rocket_Fire.wav", 1, ATTN_NORM); + //sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", 1, ATTN_NORM); missile = spawn (); missile.owner = self; diff --git a/qcsrc/worldspawn.qc b/qcsrc/worldspawn.qc index 74ee2fe67..574c6de96 100644 --- a/qcsrc/worldspawn.qc +++ b/qcsrc/worldspawn.qc @@ -62,37 +62,37 @@ void worldspawn (void) precache_model ("models/gibs/gib4.mdl"); precache_model ("models/gibs/bloodyskull.md3"); - precache_sound ("weapons/LazerGun_Fire.wav"); - precache_sound ("weapons/Uzi_Fire.wav"); - precache_sound ("weapons/Shotgun_fire.wav"); - precache_sound ("weapons/Grenade_fire.wav"); - precache_sound ("weapons/Grenade_Impact.wav"); - precache_sound ("weapons/Grenade_Bounce.wav"); - precache_sound ("weapons/NexFire.wav"); - precache_sound ("weapons/NexImpact.wav"); - precache_sound ("weapons/Electro_fire.wav"); - precache_sound ("weapons/Rocket_Fire.wav"); - precache_sound ("weapons/Rocket_Impact.wav"); - precache_sound ("weapons/Hagar_Fire.wav"); + precache_sound ("weapons/lazergun_fire.wav"); + precache_sound ("weapons/uzi_fire.wav"); + precache_sound ("weapons/shotgun_fire.wav"); + precache_sound ("weapons/grenade_fire.wav"); + precache_sound ("weapons/grenade_impact.wav"); + precache_sound ("weapons/grenade_bounce.wav"); + precache_sound ("weapons/nexfire.wav"); + precache_sound ("weapons/neximpact.wav"); + precache_sound ("weapons/electro_fire.wav"); + precache_sound ("weapons/rocket_Fire.wav"); + precache_sound ("weapons/rocket_impact.wav"); + precache_sound ("weapons/hagar_fire.wav"); precache_sound ("weapons/hagexp1.wav"); precache_sound ("weapons/hagexp2.wav"); precache_sound ("weapons/hagexp3.wav"); precache_sound ("weapons/ric1.wav"); precache_sound ("weapons/ric2.wav"); precache_sound ("weapons/ric3.wav"); - precache_sound ("weapons/WeaponPickup.wav"); + precache_sound ("weapons/weaponpickup.wav"); precache_sound ("weapons/hyprbf1a.wav"); precache_sound ("weapons/plasmx1a.wav"); precache_sound ("weapons/crylink.wav"); - precache_sound ("misc/BodyImpact1.wav"); - precache_sound ("misc/BodyImpact2.wav"); - precache_sound ("misc/Teleport.wav"); + precache_sound ("misc/bodyimpact1.wav"); + precache_sound ("misc/bodyimpact2.wav"); + precache_sound ("misc/teleport.wav"); - precache_sound ("misc/ItemRespawn.wav"); + precache_sound ("misc/itemrespawn.wav"); - precache_sound ("player/HitGround1.wav"); - precache_sound ("player/HitGround2.wav"); + precache_sound ("player/hitground1.wav"); + precache_sound ("player/hitground2.wav"); precache_sound ("demon/dland2.wav"); } -- 2.39.2