{
if (SAME_TEAM(player, e)) return e;
}
- // restart from begining
+ // restart from the beginning
for (entity e = NULL; (e = find(e, classname, STR_PLAYER)); )
{
if (SAME_TEAM(player, e)) return e;
float border = 1.5 * t;
float margin = 4.0 * t;
- float borderDiag = border * 1.414;
+ float borderDiag = border * M_SQRT2;
vector arrowX = eX * size;
vector arrowY = eY * (size+borderDiag);
vector borderX = eX * (size+borderDiag);
X(weaponthrowable, float)
#ifdef SVQC
X(reload_ammo, float)
-.float reloading_ammo = reload_ammo;
+const .float reloading_ammo = reload_ammo;
X(reload_time, float)
-.float reloading_time = reload_time;
+const .float reloading_time = reload_time;
#endif
#undef X
void XonoticGametypeList_loadCvars(entity me)
{
Gametype t = MapInfo_CurrentGametype();
+ int cnt = GameType_GetCount();
float i;
- for(i = 0; i < GameType_GetCount(); ++i)
+ for(i = 0; i < cnt; ++i)
if(t == GameType_GetID(i))
break;
- if(i >= GameType_GetCount())
+ if(i >= cnt)
{
- for(i = 0; i < GameType_GetCount(); ++i)
+ for(i = 0; i < cnt; ++i)
if(t == MAPINFO_TYPE_DEATHMATCH)
break;
- if(i >= GameType_GetCount())
+ if(i >= cnt)
i = 0;
}
me.setSelected(me, i);
int GameType_GetCount()
{
int i = 0;
+ int dev = cvar("developer");
#define GAMETYPE(id) ++i;
GAMETYPES
#undef GAMETYPE
- #define GAMETYPE(it) if (cvar("developer")) ++i;
+ #define GAMETYPE(it) if (dev) ++i;
HIDDEN_GAMETYPES
#undef GAMETYPE
return i;
allow_mutatorblocked = M_ARGV(3, bool);
if(allguns)
- {
- if(weaponinfo.spawnflags & WEP_FLAG_NORMAL)
- d = true;
- else
- d = false;
- }
+ d = boolean(weaponinfo.spawnflags & WEP_FLAG_NORMAL);
else if(!mutator_returnvalue)
d = !(!weaponinfo.weaponstart);