+#include "all.qh"
#ifndef WEAPONS_ALL_C
#define WEAPONS_ALL_C
-#include "all.qh"
-
#if defined(CSQC)
#include <client/defs.qh>
#include "../constants.qh"
#include <lib/csqcmodel/cl_model.qh>
#elif defined(MENUQC)
#elif defined(SVQC)
+ #include <common/items/_mod.qh>
#include <lib/warpzone/anglestransform.qh>
#include <lib/warpzone/common.qh>
#include <lib/warpzone/util_server.qh>
#include "../constants.qh"
#include "../stats.qh"
#include "../teams.qh"
- #include "../util.qh"
- #include "../monsters/all.qh"
+ #include <common/util.qh>
+ #include "../monsters/_mod.qh"
#include "config.qh"
#include <server/weapons/csqcprojectile.qh>
#include <server/weapons/tracing.qh>
#include <server/defs.qh>
#include "../notifications/all.qh"
#include "../deathtypes/all.qh"
- #include <server/mutators/_all.qh>
+ #include <server/mutators/_mod.qh>
#include "../mapinfo.qh"
- #include <server/command/_all.qh>
+ #include <server/command/_mod.qh>
#include <lib/csqcmodel/sv_model.qh>
#include <server/portals.qh>
#include <server/g_hook.qh>
#endif
-#ifndef MENUQC
+#ifdef GAMEQC
#include "calculations.qc"
#endif
#ifdef SVQC
#include "config.qc"
#endif
-#define IMPLEMENTATION
-#include "all.inc"
-#undef IMPLEMENTATION
+
+#include "weapon/_mod.inc"
+
// WEAPON PLUGIN SYSTEM
if (a >= 24)
{
a -= 24;
- return '0 0 1' * power2of(a);
+ return '0 0 1' * (2 ** a);
}
- return '0 1 0' * power2of(a);
+ return '0 1 0' * (2 ** a);
}
- return '1 0 0' * power2of(a);
+ return '1 0 0' * (2 ** a);
}
#ifdef SVQC
void WriteWepSet(float dst, WepSet w)
return W_FixWeaponOrder(order, 1);
}
-void W_RandomWeapons(entity e, float n)
+void W_RandomWeapons(entity e, int n)
{
- int i;
- WepSet remaining;
- WepSet result;
- remaining = e.weapons;
- result = '0 0 0';
- for (i = 0; i < n; ++i)
+ WepSet remaining = e.weapons;
+ WepSet result = '0 0 0';
+ for (int j = 0; j < n; ++j)
{
RandomSelection_Init();
FOREACH(Weapons, it != WEP_Null, {
if (remaining & (it.m_wepset))
- RandomSelection_Add(it, 0, string_null, 1, 1);
+ RandomSelection_AddEnt(it, 1, 1);
});
Weapon w = RandomSelection_chosen_ent;
result |= WepSet_FromWeapon(w);
string W_Sound(string w_snd)
{
string output = strcat("weapons/", w_snd);
-#ifdef SVQC
- MUTATOR_CALLHOOK(WeaponSound, w_snd, output);
- return M_ARGV(1, string);
-#else
- return output;
-#endif
+ MUTATOR_CALLHOOK(WeaponSound, w_snd, output);
+ return M_ARGV(1, string);
}
string W_Model(string w_mdl)
return M_ARGV(1, string);
}
-#ifndef MENUQC
+#ifdef GAMEQC
vector shotorg_adjustfromclient(vector vecs, float y_is_right, float algn)
{
switch (algn)
{
if (name == "")
{
- this.model = "";
+ vector oldmin = this.mins, oldmax = this.maxs;
+ setmodel(this, MDL_Null);
+ setsize(this, oldmin, oldmax);
if (this.weaponchild) delete(this.weaponchild);
this.weaponchild = NULL;
this.movedir = '0 0 0';
if (this.movedir.x >= 0)
{
- int algn = STAT(GUNALIGN, this.owner);
+ //int algn = STAT(GUNALIGN, this.owner);
+ int algn = W_GunAlign(this, STAT(GUNALIGN, this.owner));
+ #ifdef SVQC
+ this.m_gunalign = algn;
+ #endif
vector v = this.movedir;
this.movedir = shotorg_adjust(v, false, false, algn);
this.view_ofs = shotorg_adjust(v, false, true, algn) - v;
int compressed_shotorg = compressShotOrigin(this.movedir);
// make them match perfectly
#ifdef SVQC
- this.movedir = decompressShotOrigin(this.owner.stat_shotorg = compressed_shotorg);
+ // null during init
+ if (this.owner) this.owner.stat_shotorg = compressed_shotorg;
+ this.movedir = decompressShotOrigin(compressed_shotorg);
#else
this.movedir = decompressShotOrigin(compressed_shotorg);
#endif
}
#endif
-#ifndef MENUQC
+#ifdef GAMEQC
REGISTER_NET_TEMP(wframe)
#ifdef CSQC
a.x = ReadCoord();
a.y = ReadCoord();
a.z = ReadCoord();
+ int slot = ReadByte();
bool restartanim = ReadByte();
- anim_set(viewmodel, a, !restartanim, restartanim, restartanim);
- viewmodel.state = ReadByte();
- viewmodel.weapon_nextthink = ReadFloat();
- viewmodel.alpha = ReadByte() / 255;
- switch (viewmodel.state)
+ entity wepent = viewmodels[slot];
+ if(a.x == wepent.anim_idle_x) // we don't need to enforce idle animation
+ wepent.animstate_looping = false;
+ else
+ anim_set(wepent, a, !restartanim, restartanim, restartanim);
+ wepent.state = ReadByte();
+ wepent.weapon_nextthink = ReadFloat();
+ switch (wepent.state)
{
case WS_RAISE:
- viewmodel.weapon_switchdelay = activeweapon.switchdelay_raise;
+ wepent.weapon_switchdelay = wepent.activeweapon.switchdelay_raise;
break;
case WS_DROP:
- viewmodel.weapon_switchdelay = activeweapon.switchdelay_drop;
+ wepent.weapon_switchdelay = wepent.activeweapon.switchdelay_drop;
break;
default:
- viewmodel.weapon_switchdelay = 0;
+ wepent.weapon_switchdelay = 0;
break;
}
return true;
WriteCoord(channel, a.x);
WriteCoord(channel, a.y);
WriteCoord(channel, a.z);
+ WriteByte(channel, weaponslot(weaponentity.weaponentity_fld));
WriteByte(channel, restartanim);
WriteByte(channel, weaponentity.state);
WriteFloat(channel, weaponentity.weapon_nextthink);
- WriteByte(channel, weaponentity.m_alpha * 255);
}
#endif
}
default:
{
- LOG_INFOF("Incorrect parameters for ^2%s^7\n", "weapon_find");
+ LOG_INFOF("Incorrect parameters for ^2%s^7", "weapon_find");
}
case CMD_REQUEST_USAGE:
{
- LOG_INFO("\nUsage:^3 cl_cmd weapon_find weapon\n");
- LOG_INFO(" Where 'weapon' is the lowercase weapon name, 'all' or 'unowned'.\n");
+ LOG_INFO("Usage:^3 cl_cmd weapon_find weapon");
+ LOG_INFO(" Where 'weapon' is the lowercase weapon name, 'all' or 'unowned'.");
return;
}
}