no message
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@777 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
+42
-36
@@ -418,42 +418,48 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
|
||||
flaginfo &f = flaginfos[flag];
|
||||
f.state = getint(p);
|
||||
int action = getint(p);
|
||||
if(f.state==CTFF_STOLEN)
|
||||
{
|
||||
int actor_cn = getint(p);
|
||||
f.actor = actor_cn == getclientnum() ? player1 : getclient(actor_cn);
|
||||
f.flag->spawned = false;
|
||||
}
|
||||
else if(f.state==CTFF_DROPPED)
|
||||
{
|
||||
f.flag->x = (ushort) (getint(p)/DMF);
|
||||
f.flag->y = (ushort) (getint(p)/DMF);
|
||||
f.flag->z = (ushort) (getint(p)/DMF);
|
||||
f.flag->z -= 4;
|
||||
sqr *dropplace = S_SECURE(f.flag->x, f.flag->y);
|
||||
if(!dropplace) return;
|
||||
float floor = (float)dropplace->floor;
|
||||
if(f.flag->z > hdr.waterlevel) // above water
|
||||
{
|
||||
if(floor < hdr.waterlevel)
|
||||
f.flag->z = hdr.waterlevel; // avoid dropping into water
|
||||
else
|
||||
f.flag->z = (short)floor;
|
||||
};
|
||||
f.flag->spawned = true;
|
||||
}
|
||||
else if(f.state==CTFF_INBASE)
|
||||
{
|
||||
if(action==SV_FLAGRETURN)
|
||||
{
|
||||
int returnerer_cn = getint(p);
|
||||
f.actor = returnerer_cn == getclientnum() ? player1 : getclient(returnerer_cn);
|
||||
}
|
||||
f.flag->x = (ushort) f.originalpos.x;
|
||||
f.flag->y = (ushort) f.originalpos.y;
|
||||
f.flag->z = (ushort) f.originalpos.z;
|
||||
f.flag->spawned = true;
|
||||
};
|
||||
switch(f.state)
|
||||
{
|
||||
case CTFF_STOLEN:
|
||||
{
|
||||
int actor_cn = getint(p);
|
||||
f.actor = actor_cn == getclientnum() ? player1 : getclient(actor_cn);
|
||||
f.flag->spawned = false;
|
||||
break;
|
||||
};
|
||||
case CTFF_DROPPED:
|
||||
{
|
||||
f.flag->x = (ushort) (getint(p)/DMF);
|
||||
f.flag->y = (ushort) (getint(p)/DMF);
|
||||
f.flag->z = (ushort) (getint(p)/DMF);
|
||||
f.flag->z -= 4;
|
||||
sqr *dropplace = S_SECURE(f.flag->x, f.flag->y);
|
||||
if(!dropplace) return;
|
||||
float floor = (float)dropplace->floor;
|
||||
if(f.flag->z > hdr.waterlevel) // above water
|
||||
{
|
||||
if(floor < hdr.waterlevel)
|
||||
f.flag->z = hdr.waterlevel; // avoid dropping into water
|
||||
else
|
||||
f.flag->z = (short)floor;
|
||||
};
|
||||
f.flag->spawned = true;
|
||||
break;
|
||||
};
|
||||
case CTFF_INBASE:
|
||||
{
|
||||
if(action==SV_FLAGRETURN)
|
||||
{
|
||||
int returnerer_cn = getint(p);
|
||||
f.actor = returnerer_cn == getclientnum() ? player1 : getclient(returnerer_cn);
|
||||
};
|
||||
f.flag->x = (ushort) f.originalpos.x;
|
||||
f.flag->y = (ushort) f.originalpos.y;
|
||||
f.flag->z = (ushort) f.originalpos.z;
|
||||
f.flag->spawned = true;
|
||||
break;
|
||||
};
|
||||
};
|
||||
flagaction(flag, action);
|
||||
break;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user