clean up, and checking the distance of the items (all official maps pass in the check)
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5531 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -633,7 +633,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
|
||||
|
||||
case SV_SCOPE: // FIXME remove in the next protocol change
|
||||
{
|
||||
int cn = getint(p), val = getint(p);
|
||||
getint(p);
|
||||
getint(p);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@ enum // static entity types
|
||||
LIGHT, // lightsource, attr1 = radius, attr2 = intensity
|
||||
PLAYERSTART, // attr1 = angle, attr2 = team
|
||||
I_CLIPS, I_AMMO, I_GRENADE,
|
||||
I_HEALTH, I_HELMET, I_ARMOUR, I_AKIMBO,
|
||||
// helmet : 2010may16 -> mapversion:8
|
||||
I_HEALTH, I_HELMET, I_ARMOUR, I_AKIMBO,
|
||||
// helmet : 2010may16 -> mapversion:8
|
||||
MAPMODEL, // attr1 = angle, attr2 = idx
|
||||
CARROT, // attr1 = tag, attr2 = type
|
||||
LADDER,
|
||||
|
||||
@@ -50,6 +50,47 @@ bool mapisok(mapstats *ms)
|
||||
FlagFlag = pow2(fl[0].x - fl[1].x) + pow2(fl[0].y - fl[1].y);
|
||||
}
|
||||
else FlagFlag = MINFF * 1000; // the map has no flags
|
||||
|
||||
for (int i = 0; i < ms->hdr.numents; i++)
|
||||
{
|
||||
int v = ms->enttypes[i];
|
||||
if (v < I_CLIPS || v > I_AKIMBO) continue;
|
||||
short *p = &ms->entposs[i*3];
|
||||
float density = 0, hdensity = 0;
|
||||
for(int j = 0; j < ms->hdr.numents; j++)
|
||||
{
|
||||
int w = ms->enttypes[j];
|
||||
if (w < I_CLIPS || w > I_AKIMBO || i == j) continue;
|
||||
short *q = &ms->entposs[j*3];
|
||||
float r2 = 0;
|
||||
loopk(3){ r2 += (p[k]-q[k])*(p[k]-q[k]); }
|
||||
if ( r2 == 0.0f ) return false;
|
||||
r2 = 1/r2;
|
||||
if (r2 < 0.0025f) continue;
|
||||
if (w != v)
|
||||
{
|
||||
hdensity += r2;
|
||||
continue;
|
||||
}
|
||||
density += r2;
|
||||
}
|
||||
/* if (hdensity > 0.0f) { logline(ACLOG_INFO, "ITEM CHECK H %s %f", entnames[v], hdensity); }
|
||||
if (density > 0.0f) { logline(ACLOG_INFO, "ITEM CHECK D %s %f", entnames[v], density); }*/
|
||||
if ( hdensity > 0.5f ) return false;
|
||||
if (v==I_HEALTH)
|
||||
{
|
||||
if( density > 0.24f ) return false;
|
||||
}
|
||||
else if (v==I_GRENADE)
|
||||
{
|
||||
if( density > 0.005f ) return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( density > 0.04f ) return false;
|
||||
}
|
||||
|
||||
}
|
||||
return Mheight < MAXMHEIGHT && (Mopen = checkarea(testlayout_factor, testlayout)) < MAXMAREA && FlagFlag > MINFF;
|
||||
}
|
||||
|
||||
@@ -84,7 +125,7 @@ struct mapaction : serveraction
|
||||
mapok = ms != NULL && ( (mode != GMODE_COOPEDIT && mapisok(ms)) || (mode == GMODE_COOPEDIT && !readonlymap(maploc)) );
|
||||
if(!mapok)
|
||||
{
|
||||
defformatstring(msg)("%s", ms ? ( readonlymap(maploc) ? "this map cannot be coopedited in this server" : "sorry, but this map does not satisfy some quality requisites to be played in MultiPlayer Mode" ) : "the server does not have this map" );
|
||||
defformatstring(msg)("%s", ms ? ( mode == GMODE_COOPEDIT ? "this map cannot be coopedited in this server" : "sorry, but this map does not satisfy some quality requisites to be played in MultiPlayer Mode" ) : "the server does not have this map" );
|
||||
if(notify) sendservmsg(msg, caller);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -68,7 +68,7 @@ mapstats *loadmapstats(const char *filename, bool getlayout)
|
||||
if(e.type == CTF_FLAG && (e.attr2 == 0 || e.attr2 == 1)) { s.flags[e.attr2]++; s.flagents[e.attr2] = i; }
|
||||
s.entcnt[e.type]++;
|
||||
enttypes[i] = e.type;
|
||||
entposs[i * 3] = e.x; entposs[i * 3 + 1] = e.y; entposs[i * 3 + 2] = e.z;
|
||||
entposs[i * 3] = e.x; entposs[i * 3 + 1] = e.y; entposs[i * 3 + 2] = e.z + e.attr1;
|
||||
}
|
||||
DELETEA(testlayout);
|
||||
if(s.hdr.sfactor <= LARGEST_FACTOR && s.hdr.sfactor >= SMALLEST_FACTOR)
|
||||
|
||||
+38
-38
@@ -74,45 +74,45 @@ struct mapstats
|
||||
} \
|
||||
if(headr.version<6 && strncmp(headr.head,"CUBE",4)==0) /* only render lights, pl starts and map models on old maps // <6 was <MAPVERSION but we're now at #7 (flowtron) */ \
|
||||
{ \
|
||||
switch(e.type) \
|
||||
{ \
|
||||
case 1: /* old light */ \
|
||||
e.type=LIGHT; \
|
||||
break; \
|
||||
case 2: /* old player start */ \
|
||||
e.type=PLAYERSTART; \
|
||||
break; \
|
||||
case 3: \
|
||||
case 4: \
|
||||
case 5: \
|
||||
case 6: \
|
||||
e.type=I_AMMO; \
|
||||
break; \
|
||||
case 7: /* old health */ \
|
||||
e.type=I_HEALTH; \
|
||||
break; \
|
||||
case 8: /* old boost */ \
|
||||
e.type=I_HEALTH; \
|
||||
break; \
|
||||
case 9: /* armour */ \
|
||||
e.type=I_HELMET; \
|
||||
break; \
|
||||
case 10: /* armor */ \
|
||||
e.type=I_ARMOUR; \
|
||||
break; \
|
||||
case 11: /* quad */ \
|
||||
e.type=I_AKIMBO; \
|
||||
break; \
|
||||
case 14: /* old map model */ \
|
||||
e.type=MAPMODEL; \
|
||||
break; \
|
||||
default: \
|
||||
e.type=NOTUSED; \
|
||||
} \
|
||||
switch(e.type) \
|
||||
{ \
|
||||
case 1: /* old light */ \
|
||||
e.type=LIGHT; \
|
||||
break; \
|
||||
case 2: /* old player start */ \
|
||||
e.type=PLAYERSTART; \
|
||||
break; \
|
||||
case 3: \
|
||||
case 4: \
|
||||
case 5: \
|
||||
case 6: \
|
||||
e.type=I_AMMO; \
|
||||
break; \
|
||||
case 7: /* old health */ \
|
||||
e.type=I_HEALTH; \
|
||||
break; \
|
||||
case 8: /* old boost */ \
|
||||
e.type=I_HEALTH; \
|
||||
break; \
|
||||
case 9: /* armour */ \
|
||||
e.type=I_HELMET; \
|
||||
break; \
|
||||
case 10: /* armor */ \
|
||||
e.type=I_ARMOUR; \
|
||||
break; \
|
||||
case 11: /* quad */ \
|
||||
e.type=I_AKIMBO; \
|
||||
break; \
|
||||
case 14: /* old map model */ \
|
||||
e.type=MAPMODEL; \
|
||||
break; \
|
||||
default: \
|
||||
e.type=NOTUSED; \
|
||||
} \
|
||||
} \
|
||||
if(headr.version>=6 && headr.version<8) { \
|
||||
if( e.type >= I_HELMET && e.type < (MAXENTTYPES - 1) ) { e.type += 1; } \
|
||||
}
|
||||
if(headr.version>=6 && headr.version<8) { \
|
||||
if( e.type >= I_HELMET && e.type < (MAXENTTYPES - 1) ) { e.type += 1; } \
|
||||
}
|
||||
|
||||
#define SWS(w,x,y,s) (&(w)[((y)<<(s))+(x)])
|
||||
#define SW(w,x,y) SWS(w,x,y,sfactor)
|
||||
|
||||
Reference in New Issue
Block a user