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

- externalized samsite coordinates concerning strategic AI action and Skyrider dialogue (by Buggler)

Browse Source 
- minor ENG language tweaks to traits popup help text (by Buggler)
- translated a few missing German Texts in _Ja25GermanText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6410 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-09-17 14:44:55 +00:00
parent 30cc0160cf
commit b268d330ed
15 changed files with 791 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Helicopter.cpp
+6 -6
View File
@@ -1133,7 +1133,7 @@ void HandleSkyRiderMonologueAboutDrassenSAMSite( UINT32 uiSpecialCode )
CharacterDialogue( SKYRIDER, MENTION_DRASSEN_SAM_SITE, uiExternalStaticNPCFaces[ SKYRIDER_EXTERNAL_FACE ], DIALOGUE_EXTERNAL_NPC_UI, FALSE, FALSE );
CharacterDialogueWithSpecialEvent( SKYRIDER, MENTION_DRASSEN_SAM_SITE, uiExternalStaticNPCFaces[ SKYRIDER_EXTERNAL_FACE ], DIALOGUE_EXTERNAL_NPC_UI , FALSE , TRUE , DIALOGUE_SPECIAL_EVENT_SKYRIDERMAPSCREENEVENT ,SKYRIDER_MONOLOGUE_EVENT_DRASSEN_SAM_SITE, 1 );
if( SAMSitesUnderPlayerControl( SAM_2_X, SAM_2_Y ) == FALSE )
if( SAMSitesUnderPlayerControl( gpSamSectorX[1], gpSamSectorY[1] ) == FALSE )
{
CharacterDialogue( SKYRIDER, SECOND_HALF_OF_MENTION_DRASSEN_SAM_SITE, uiExternalStaticNPCFaces[ SKYRIDER_EXTERNAL_FACE ], DIALOGUE_EXTERNAL_NPC_UI, FALSE, FALSE );
}
@@ -1282,8 +1282,8 @@ void HandleAnimationOfSectors( void )
if( fShowDrassenSAMHighLight )
{
fOldShowDrassenSAMHighLight = TRUE;
// Drassen's SAM site is #3
HandleBlitOfSectorLocatorIcon( SAM_2_X, SAM_2_Y, 0, LOCATOR_COLOR_RED );
// Drassen's SAM site is #2
HandleBlitOfSectorLocatorIcon( gpSamSectorX[1], gpSamSectorY[1], 0, LOCATOR_COLOR_RED );
fSkipSpeakersLocator = TRUE;
}
else if( fOldShowDrassenSAMHighLight )
@@ -1309,9 +1309,9 @@ void HandleAnimationOfSectors( void )
if( fShowOtherSAMHighLight )
{
fOldShowOtherSAMHighLight = TRUE;
HandleBlitOfSectorLocatorIcon( SAM_1_X, SAM_1_Y, 0, LOCATOR_COLOR_RED );
HandleBlitOfSectorLocatorIcon( SAM_3_X, SAM_3_Y, 0, LOCATOR_COLOR_RED );
HandleBlitOfSectorLocatorIcon( SAM_4_X, SAM_4_Y, 0, LOCATOR_COLOR_RED );
HandleBlitOfSectorLocatorIcon( gpSamSectorX[0], gpSamSectorY[0], 0, LOCATOR_COLOR_RED );
HandleBlitOfSectorLocatorIcon( gpSamSectorX[2], gpSamSectorY[2], 0, LOCATOR_COLOR_RED );
HandleBlitOfSectorLocatorIcon( gpSamSectorX[3], gpSamSectorY[3], 0, LOCATOR_COLOR_RED );
fSkipSpeakersLocator = TRUE;
}
else if( fOldShowOtherSAMHighLight )
Strategic/Map Screen Interface Map.cpp
-3
View File
@@ -452,9 +452,6 @@ POINT pTownPoints[ MAX_TOWNS ];/*={
};
*/
// coordinates X,Y of sam sites on strategic map
INT16 gpSamSectorX[ MAX_NUMBER_OF_SAMS ];
INT16 gpSamSectorY[ MAX_NUMBER_OF_SAMS ];
extern BOOLEAN fSamSiteFoundOrig[ MAX_NUMBER_OF_SAMS ];
Strategic/Meanwhile.cpp
+3 -4
View File
@@ -147,7 +147,6 @@ UINT32 uiMeanWhileFlags = 0;
extern void InternalLocateGridNo( INT32 sGridNo, BOOLEAN fForce );
void ProcessImplicationsOfMeanwhile( void );
// set flag for this event
@@ -786,13 +785,13 @@ void ProcessImplicationsOfMeanwhile( void )
}
break;
case NW_SAM:
ExecuteStrategicAIAction( NPC_ACTION_SEND_TROOPS_TO_SAM, SAM_1_X, SAM_1_Y );
ExecuteStrategicAIAction( NPC_ACTION_SEND_TROOPS_TO_SAM, gpSamSectorX[0], gpSamSectorY[0] );
break;
case NE_SAM:
ExecuteStrategicAIAction( NPC_ACTION_SEND_TROOPS_TO_SAM, SAM_2_X, SAM_2_Y );
ExecuteStrategicAIAction( NPC_ACTION_SEND_TROOPS_TO_SAM, gpSamSectorX[1], gpSamSectorY[1] );
break;
case CENTRAL_SAM:
ExecuteStrategicAIAction( NPC_ACTION_SEND_TROOPS_TO_SAM, SAM_3_X, SAM_3_X );
ExecuteStrategicAIAction( NPC_ACTION_SEND_TROOPS_TO_SAM, gpSamSectorX[2], gpSamSectorY[2] );
break;
default:
Strategic/strategicmap.cpp
+4 -2
View File
@@ -217,6 +217,10 @@ INT16 pSamList[ MAX_NUMBER_OF_SAMS ];
INT32 pSamGridNoAList[ MAX_NUMBER_OF_SAMS ];
INT32 pSamGridNoBList[ MAX_NUMBER_OF_SAMS ];
// coordinates X,Y of sam sites on strategic map
INT16 gpSamSectorX[ MAX_NUMBER_OF_SAMS ];
INT16 gpSamSectorY[ MAX_NUMBER_OF_SAMS ];
// ATE: Update this w/ graphic used
// Use 3 if / orientation, 4 if \ orientation
INT8 gbSAMGraphicList[ MAX_NUMBER_OF_SAMS ];
@@ -415,8 +419,6 @@ void CrippledVersionFailureToLoadMapCheck();
#define MAX_CHAR_DATA_LENGTH 500
#define INVALID_SAMSITE_INDEX -1
extern INT16 gpSamSectorX[ MAX_NUMBER_OF_SAMS ];
extern INT16 gpSamSectorY[ MAX_NUMBER_OF_SAMS ];
typedef enum
{
Strategic/strategicmap.h
+4 -1
View File
@@ -44,13 +44,15 @@ extern UINT8 NUMBER_OF_SAMS;
extern INT16 pSamList[ MAX_NUMBER_OF_SAMS ];
extern INT32 pSamGridNoAList[ MAX_NUMBER_OF_SAMS ];
extern INT32 pSamGridNoBList[ MAX_NUMBER_OF_SAMS ];
extern INT16 gpSamSectorX[ MAX_NUMBER_OF_SAMS ];
extern INT16 gpSamSectorY[ MAX_NUMBER_OF_SAMS ];
extern BOOLEAN fFoundOrta;
extern BOOLEAN fSamSiteFound[ MAX_NUMBER_OF_SAMS ];
extern BOOLEAN gfUseAlternateMap;
/* Buggler: used externalized gpSamSectorX[ MAX_NUMBER_OF_SAMS ] values instead of hardcoded ones
// SAM sites
#define SAM_1_X 2
#define SAM_2_X 15
@@ -61,6 +63,7 @@ extern BOOLEAN gfUseAlternateMap;
#define SAM_2_Y 4
#define SAM_3_Y 9
#define SAM_4_Y 14
*/
// min condition for sam site to be functional
#define MIN_CONDITION_FOR_SAM_SITE_TO_WORK 80