1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

*************************

Browse Source 
* HAM 3.6 (by Headrock) *
*************************
- Info: Needed GameDir files for HAM 3.6 are not committed yet to the SVN GameDir. Will do that in the next few days
- For more infos on HAM 3.6 check out: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=244808&page=0&fpart=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-20 15:49:46 +00:00
parent 53821fcf49
commit f010769397
120 changed files with 16937 additions and 2200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Init List.cpp
+26 -7
View File
@@ -1915,8 +1915,7 @@ void AddSoldierInitListBloodcats()
{ //This map has no bloodcat placements, so don't waste CPU time.
return;
}
if( pSector->bBloodCatPlacements )
else
{ //We don't yet know the number of bloodcat placements in this sector so
//count them now, and permanently record it.
INT8 bBloodCatPlacements = 0;
@@ -1929,7 +1928,18 @@ void AddSoldierInitListBloodcats()
}
curr = curr->next;
}
if( bBloodCatPlacements != pSector->bBloodCatPlacements &&
// No placements on the map itself?
if( !bBloodCatPlacements )
{
// Don't place!
return;
}
// HEADROCK HAM 3.6: Check has been changed completely. We now use whichever value is lower - the ones we've
// set from XML, or the ones existing on the map. Either could override the other, if it is lower.
pSector->bBloodCatPlacements = __min(bBloodCatPlacements, pSector->bBloodCatPlacements);
pSector->bBloodCats = __min(pSector->bBloodCats, pSector->bBloodCatPlacements);
/*if( bBloodCatPlacements != pSector->bBloodCatPlacements &&
ubSectorID != SEC_I16 && ubSectorID != SEC_N5 )
{
#ifdef JA2BETAVERSION
@@ -1938,18 +1948,21 @@ void AddSoldierInitListBloodcats()
pSector->bBloodCatPlacements, gWorldSectorY + 'A' - 1, gWorldSectorX, bBloodCatPlacements );
DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL );
#endif
// WANNE: Fix by Headrock
// HEADROCK HAM 3.5: This "solution" is extremely silly, as it prevents legal placement of bloodcats
// on the map if any discrepancy is encountered, which limits modders severely. Also, because the
// pSector->bBloodCatPlacements value is hardcoded, there is virtually no way for modders to increase
// the number of bloodcats on their own.
//pSector->bBloodCatPlacements = bBloodCatPlacements;
//pSector->bBloodCats = -1;
// A better solution is to limit the number of bloodcats on the map based on whichever is lower - the
// hardcode, or the map-read value.
pSector->bBloodCatPlacements = __min(bBloodCatPlacements, pSector->bBloodCatPlacements);
pSector->bBloodCats = __min(pSector->bBloodCats, pSector->bBloodCatPlacements);
if( !bBloodCatPlacements )
{
return;
}
}
}*/
}
if( pSector->bBloodCats > 0 )
{ //Add them to the world now...
@@ -2565,5 +2578,11 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu
}
UpdateMercInSector( pSoldier, gWorldSectorX, gWorldSectorY, 0 );
}
// HEADROCK HAM 3.2: Experimental, militia reinforcements arrive with 0 APs.
if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 1 || gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 3)
{
pSoldier->bActionPoints = 0;
}
}
}