From: Samual Date: Tue, 24 Jul 2012 06:19:22 +0000 (-0400) Subject: More consistency X-Git-Tag: xonotic-v0.8.0~152^2~408^2~39 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12e194f2901cd1a9cccfa74fa1346b4efbb433ea;p=xonotic%2Fxonotic-data.pk3dir.git More consistency --- diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index 88f44f398..ef08d5608 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -1,5 +1,5 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(LASER, w_laser, 0, 1, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, 0, "laser", "laser", _("Laser")) +REGISTER_WEAPON(LASER, W_Laser, 0, 1, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, 0, "laser", "laser", _("Laser")) #else #ifdef SVQC void(float imp) W_SwitchWeapon; @@ -366,7 +366,7 @@ void spawnfunc_weapon_laser(void) weapon_defaultspawnfunc(WEP_LASER); } -float w_laser(float request) +float W_Laser(float request) { switch(request) { @@ -470,7 +470,7 @@ float w_laser(float request) } #endif #ifdef CSQC -float w_laser(float request) +float W_Laser(float request) { switch(request) { diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 57f4bcec0..83f06e5e0 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -242,7 +242,7 @@ float w_minstanex(float req) precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else - w_laser(WR_PRECACHE); + W_Laser(WR_PRECACHE); } else if (req == WR_SETUP) {