* fixed bullet artifacts and removal !

* hopefull disable of grenades
* added a LOS check from your mercs to a door to see if it should be animated or not.

* looked into the "ENEMY_ENABLED" issue, it is not double defined, the one in network.h is part of a struct and not connected. made some changes to do tests for ==0 or ==1 rather than boolean. but i believe there must be some misunderstanding possibly. ENEMY_ENABLED only enables or disables the enemy AI, And only when coop is enabled... when its not there is no ai whatsoever, but you can still get into deathmatch battle under the various ini settings.

enjoy, the bullets are finishing themselves off much better now ! :)


 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
haydent
2008-05-16 08:36:19 +00:00
parent a04768e6a6
commit 66d55cf08a
11 changed files with 56 additions and 27 deletions
+9 -9
View File
@@ -1749,7 +1749,7 @@ BOOLEAN SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
{
if (is_networked)
{
if(is_server && ENEMY_ENABLED)
if(is_server && ENEMY_ENABLED==1)
PrepareEnemyForSectorBattle();
}
else
@@ -1768,7 +1768,7 @@ BOOLEAN SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
{
if (is_networked)
{
if(is_server && CREATURE_ENABLED)
if(is_server && CREATURE_ENABLED==1)
PrepareCreaturesForBattle();
}
else
@@ -2074,7 +2074,7 @@ void PrepareLoadedSector()
if (is_networked)
{
if( is_server && fAddCivs && CIV_ENABLED)//hayden its around here we apply .ini choices for Ai
if( is_server && fAddCivs && CIV_ENABLED==1)//hayden its around here we apply .ini choices for Ai
{
AddSoldierInitListTeamToWorld( CIV_TEAM, 255 );
}
@@ -2084,10 +2084,10 @@ void PrepareLoadedSector()
AddSoldierInitListTeamToWorld( CIV_TEAM, 255 );
}
if(is_server && MILITIA_ENABLED)
if(is_server && MILITIA_ENABLED==1)
AddSoldierInitListTeamToWorld( MILITIA_TEAM, 255 );
if(is_server && CREATURE_ENABLED)
if(is_server && CREATURE_ENABLED==1)
AddSoldierInitListBloodcats();
//Creatures are only added if there are actually some of them. It has to go through some
@@ -2121,11 +2121,11 @@ void PrepareLoadedSector()
// Haydent
if (is_networked)
{
if(is_server && CREATURE_ENABLED)
if(is_server && CREATURE_ENABLED==1)
PrepareCreaturesForBattle();
// Haydent
if(is_server && MILITIA_ENABLED)
if(is_server && MILITIA_ENABLED==1)
PrepareMilitiaForTactical(FALSE);
}
else
@@ -2148,7 +2148,7 @@ void PrepareLoadedSector()
if (is_networked)
{
if(is_server && CIV_ENABLED)
if(is_server && CIV_ENABLED==1)
AddProfilesNotUsingProfileInsertionData(); //hayden: is just for civ's
}
else
@@ -2160,7 +2160,7 @@ void PrepareLoadedSector()
{
if (is_networked)
{
if(is_server && ENEMY_ENABLED)
if(is_server && ENEMY_ENABLED==1)
fEnemyPresenceInThisSector = PrepareEnemyForSectorBattle();
}
else