showmapstats and mapstats_hud commands (client side map quality information), putting scopesens alias back to defaults, commenting spectating logs info, and updating docs
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5775 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -240,14 +240,70 @@ void parsepositions(ucharbuf &p)
|
||||
|
||||
extern int checkarea(int maplayout_factor, char *maplayout);
|
||||
char *mlayout = NULL;
|
||||
int Mv = 0, Ma = 0; // moved up:, MA = 0;
|
||||
int Mv = 0, Ma = 0, F2F = 1000 * MINFF; // moved up:, MA = 0;
|
||||
float Mh = 0;
|
||||
extern int connected;
|
||||
extern bool noflags;
|
||||
bool item_fail = false;
|
||||
int map_quality = MAP_IS_EDITABLE;
|
||||
|
||||
/// TODO: many functions and variables are redundant between client and server... someone should redo the entire server code and unify client and server.
|
||||
bool good_map() // call this function only at startmap
|
||||
{
|
||||
map_quality = ((MA = checkarea(sfactor, mlayout)) < MAXMAREA && Mh < MAXMHEIGHT) ? MAP_IS_GOOD : MAP_IS_BAD;
|
||||
if (mlayout) MA = checkarea(sfactor, mlayout);
|
||||
|
||||
if(m_flags)
|
||||
{
|
||||
flaginfo &f0 = flaginfos[0];
|
||||
flaginfo &f1 = flaginfos[1];
|
||||
#define DIST(x) (f0.pos.x - f1.pos.x)
|
||||
F2F = (!numflagspawn[0] || !numflagspawn[1]) ? 1000 * MINFF : (int) fSqrt(DIST(x)*DIST(x)+DIST(y)*DIST(y));
|
||||
#undef DIST
|
||||
}
|
||||
|
||||
item_fail = false;
|
||||
|
||||
loopv(ents)
|
||||
{
|
||||
entity &e1 = ents[i];
|
||||
if (e1.type < I_CLIPS || e1.type > I_AKIMBO) continue;
|
||||
float density = 0, hdensity = 0;
|
||||
loopvj(ents)
|
||||
{
|
||||
entity &e2 = ents[j];
|
||||
if (e2.type < I_CLIPS || e2.type > I_AKIMBO || i == j) continue;
|
||||
#define DIST(x) (e1.x - e2.x)
|
||||
#define DIST_ATT ((e1.z + e1.attr1) - (e2.z + e2.attr1))
|
||||
float r2 = DIST(x)*DIST(x) + DIST(y)*DIST(y) + DIST_ATT*DIST_ATT;
|
||||
#undef DIST_ATT
|
||||
#undef DIST
|
||||
if ( r2 == 0.0f ) { conoutf("\f3MAP CHECK FAIL: Items too close %s %s (%hd,%hd)", entnames[e1.type], entnames[e2.type],e1.x,e1.y); item_fail = true; break; }
|
||||
r2 = 1/r2;
|
||||
if (r2 < 0.0025f) continue;
|
||||
if (e1.type != e2.type)
|
||||
{
|
||||
hdensity += r2;
|
||||
continue;
|
||||
}
|
||||
density += r2;
|
||||
}
|
||||
if ( hdensity > 0.5f ) { conoutf("\f3MAP CHECK FAIL: Items too close %s %.2f (%hd,%hd)", entnames[e1.type],hdensity,e1.x,e1.y); item_fail = true; break; }
|
||||
switch(e1.type)
|
||||
{
|
||||
#define LOGTHISSWITCH(X) if( density > X ) { conoutf("\f3MAP CHECK FAIL: Items too close %s %.2f (%hd,%hd)", entnames[e1.type],density,e1.x,e1.y); item_fail = true; break; }
|
||||
case I_CLIPS:
|
||||
case I_HEALTH: LOGTHISSWITCH(0.24f); break;
|
||||
case I_AMMO: LOGTHISSWITCH(0.04f); break;
|
||||
case I_HELMET: LOGTHISSWITCH(0.02f); break;
|
||||
case I_ARMOUR:
|
||||
case I_GRENADE:
|
||||
case I_AKIMBO: LOGTHISSWITCH(0.005f); break;
|
||||
default: break;
|
||||
#undef LOGTHISSWITCH
|
||||
}
|
||||
}
|
||||
|
||||
map_quality = (!item_fail && F2F > MINFF && MA < MAXMAREA && Mh < MAXMHEIGHT) ? MAP_IS_GOOD : MAP_IS_BAD;
|
||||
if ( (!connected || gamemode == GMODE_COOPEDIT) && map_quality == MAP_IS_BAD ) map_quality = MAP_IS_EDITABLE;
|
||||
return map_quality;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user