1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- added ini option to turn off eating sounds

Browse Source 
- morale now influences surrender strength
- placing prisoners now accounts for missing xml values
- damaging a building with eplosives alters loyalty depending on attacker's team

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-03-05 21:26:58 +00:00
parent 88cb595c23
commit ce0a49e4b4
6 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Create.cpp
+45 -21
View File
@@ -3170,6 +3170,41 @@ extern SECTOR_EXT_DATA SectorExternalData[256][4];
static UINT8 roomcnt = 0;
// For now, this is only used for prison cells
INT32 GetSittableGridNoInRoom(UINT16 usRoom, BOOLEAN fEnoughSpace)
{
INT32 insertiongridno = NOWHERE;
// get sector data and look fo a fitting room
UINT8 ubSectorId = SECTOR(gWorldSectorX, gWorldSectorY);
if ( ubSectorId >= 0 && ubSectorId < 256 )
{
for ( UINT32 uiLoop = 0; uiLoop < WORLD_MAX; ++uiLoop )
{
if ( (gusWorldRoomInfo[ uiLoop ] == usRoom) )
{
if ( fEnoughSpace )
{
// we have to make sure that the gridno is deep in the room, as otherwise the gridno might be corrected to be on the other side of a wall
if ( ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(NORTH) ) ] != usRoom )
|| ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(EAST) ) ] != usRoom )
|| ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(SOUTH) ) ] != usRoom )
|| ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(WEST) ) ] != usRoom ) )
continue;
}
// check wether this location is sittable
if ( IsLocationSittable( uiLoop, 0 ) )
{
return uiLoop;
}
}
}
}
return NOWHERE;
}
void CreatePrisonerOfWar()
{
INT32 insertiongridno = NOWHERE;
@@ -3178,36 +3213,25 @@ void CreatePrisonerOfWar()
UINT8 ubSectorId = SECTOR(gWorldSectorX, gWorldSectorY);
if ( ubSectorId >= 0 && ubSectorId < 256 )
{
// We need to 'condense' the room numbers, as some might be empty in the xml
UINT16 realrooms[MAX_PRISON_ROOMS];
UINT8 numrooms = 0;
for(UINT8 i = 0; i < MAX_PRISON_ROOMS; ++i)
{
if ( SectorExternalData[ubSectorId][0].usPrisonRoomNumber[i] > 0)
++numrooms;
{
realrooms[numrooms++] = SectorExternalData[ubSectorId][0].usPrisonRoomNumber[i];
}
}
++roomcnt;
if ( roomcnt >= numrooms )
roomcnt = 0;
UINT16 room = SectorExternalData[ubSectorId][0].usPrisonRoomNumber[roomcnt];
UINT16 room = realrooms[roomcnt];
for ( UINT32 uiLoop = 0; uiLoop < WORLD_MAX; ++uiLoop )
{
if ( (gusWorldRoomInfo[ uiLoop ] == room) )
{
// we have to make sure that the gridno is deep in the room, as otherwise the gridno might be corrected to be on the other side of a wall
if ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(NORTH) ) ] == room )
if ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(EAST) ) ] == room )
if ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(SOUTH) ) ] == room )
if ( gusWorldRoomInfo[ NewGridNo( uiLoop, DirectionInc(WEST) ) ] == room )
{
// check wether this location is sittable
if ( IsLocationSittable( uiLoop, 0 ) )
{
insertiongridno = uiLoop;
break;
}
}
}
}
insertiongridno = GetSittableGridNoInRoom(room, TRUE);
// invalid gridno? Get out of here
if ( TileIsOutOfBounds(insertiongridno) )