Merged Multi Player Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-05-12 08:20:47 +00:00
parent c448713412
commit 3e22dce318
132 changed files with 14527 additions and 4859 deletions
+19 -1
View File
@@ -17,7 +17,7 @@
#include "Soldier macros.h"
#include "Render Fun.h"
#endif
#include "connect.h"
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
class SOLDIERTYPE;
@@ -878,6 +878,24 @@ void HaltMoveForSoldierOutOfPoints(SOLDIERTYPE *pSoldier)
return;
}
if (is_networked)
{
EV_S_STOP_MERC SStopMerc;
SStopMerc.sGridNo = pSoldier->sGridNo;
SStopMerc.ubDirection = pSoldier->ubDirection;
SStopMerc.usSoldierID = pSoldier->ubID;
SStopMerc.fset=TRUE;
SStopMerc.sXPos=pSoldier->sX;
SStopMerc.sYPos=pSoldier->sY;
//AddGameEvent( S_STOP_MERC, 0, &SStopMerc ); //hayden.
if(pSoldier->ubID>=120)
return;//hayden
if(is_client)
send_stop(&SStopMerc);
}
// record that this merc can no longer animate and why...
pSoldier->AdjustNoAPToFinishMove( TRUE );