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

Externalized (by Buggler)

Browse Source 
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6495 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-14 11:57:08 +00:00
parent dcf1df3c72
commit 7f489a1b53
9 changed files with 116 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Meanwhile.cpp
+12 -12
View File
@@ -750,25 +750,25 @@ void ProcessImplicationsOfMeanwhile( void )
StartQuest( QUEST_FIND_SCIENTIST, -1, -1 );
// place Madlab and robot!
if ( SectorInfo[ SECTOR( 7, MAP_ROW_H ) ].uiFlags & SF_USE_ALTERNATE_MAP )
if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector1X, gModSettings.ubMeanwhileAddMadlabSector1Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(7, 8)
{
sSectorX = 7;
sSectorY = MAP_ROW_H;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector1X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector1Y;
}
else if ( SectorInfo[ SECTOR( 16, MAP_ROW_H ) ].uiFlags & SF_USE_ALTERNATE_MAP )
else if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector2X, gModSettings.ubMeanwhileAddMadlabSector2Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(16, 8)
{
sSectorX = 16;
sSectorY = MAP_ROW_H;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector2X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector2Y;
}
else if ( SectorInfo[ SECTOR( 11, MAP_ROW_I ) ].uiFlags & SF_USE_ALTERNATE_MAP )
else if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector3X, gModSettings.ubMeanwhileAddMadlabSector3Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(11, 9)
{
sSectorX = 11;
sSectorY = MAP_ROW_I;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector3X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector3Y;
}
else if ( SectorInfo[ SECTOR( 4, MAP_ROW_E ) ].uiFlags & SF_USE_ALTERNATE_MAP )
else if ( SectorInfo[ SECTOR( gModSettings.ubMeanwhileAddMadlabSector4X, gModSettings.ubMeanwhileAddMadlabSector4Y ) ].uiFlags & SF_USE_ALTERNATE_MAP ) //(4, 5)
{
sSectorX = 4;
sSectorY = MAP_ROW_E;
sSectorX = gModSettings.ubMeanwhileAddMadlabSector4X;
sSectorY = gModSettings.ubMeanwhileAddMadlabSector4Y;
}
else
{