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

New Feature: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279

Browse Source 
Does not break savegame compatibility.

Requires GameDir revision >= r2130.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-08-30 17:34:25 +00:00
parent 5fc358f70c
commit e00897b91b
40 changed files with 1613 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/DynamicDialogue.cpp
+11 -11
View File
@@ -304,7 +304,7 @@ BOOLEAN LoadDynamicDialogue( HWFILE hwFile )
for ( UINT32 i = 0; i < size; ++i )
{
DynamicOpinionSpeechEvent event;
numBytesRead = ReadFieldByField( hwFile, &event, sizeof(event), sizeof(DynamicOpinionSpeechEvent), numBytesRead );
numBytesRead = ReadFieldByField( hwFile, &event, sizeof(event), sizeof(DynamicOpinionSpeechEvent), 0 );
gDynamicOpinionSpeechEventArchiveVector.push_back( event );
}
@@ -312,7 +312,7 @@ BOOLEAN LoadDynamicDialogue( HWFILE hwFile )
UINT32 safetycheck2 = 0;
numBytesRead = ReadFieldByField( hwFile, &safetycheck2, sizeof(safetycheck2), sizeof(UINT32), numBytesRead );
if ( gDynDiaSaveCheck != gDynDiaSaveCheck || gDynDiaSaveCheck != gDynDiaSaveCheck )
if ( safetycheck1 != gDynDiaSaveCheck || safetycheck2 != gDynDiaSaveCheck )
{
ScreenMsg( FONT_MCOLOR_LTGREEN, MSG_INTERFACE, L"Eyecatcher corruption detected while loading dynamic dialogue events!" );
return FALSE;
@@ -383,7 +383,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
// that way, if several opinon events regarding the same thing are set, we will have dialogue over all of that
UINT8 cnt = 0;
aEvent.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
aEvent.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
UINT8 queuenumber = aEvent.usQueueNumber + 1;
@@ -449,7 +449,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
response.usQueueNumber = queuenumber++;
response.usSide = DOST_POSITION_LEFT;
response.usNumonside = (UINT8)GetSidePosition( response.usSide );
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
gDynamicOpinionSpeechEventVector.push_back( response );
gDynamicOpinionSpeechInCurrentDialogue.push_back( response );
@@ -464,7 +464,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
response.usQueueNumber = queuenumber++;
response.usSide = DOST_POSITION_RIGHT;
response.usNumonside = (UINT8)GetSidePosition( response.usSide );
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
gDynamicOpinionSpeechEventVector.push_back( response );
gDynamicOpinionSpeechInCurrentDialogue.push_back( response );
@@ -606,7 +606,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
{
impaction.usQueueNumber = queuenumber++;
impaction.usNumonside = (UINT8)GetSidePosition( impaction.usSide );
impaction.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
impaction.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
gDynamicOpinionSpeechEventVector.push_back( impaction );
gDynamicOpinionSpeechInCurrentDialogue.push_back( impaction );
@@ -626,7 +626,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
response.usQueueNumber = queuenumber++;
response.usSide = DOST_POSITION_LEFT;
response.usNumonside = (UINT8)GetSidePosition( response.usSide );
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
gDynamicOpinionSpeechEventVector.push_back( response );
gDynamicOpinionSpeechInCurrentDialogue.push_back( response );
@@ -642,7 +642,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
response.usQueueNumber = queuenumber++;
response.usSide = DOST_POSITION_RIGHT;
response.usNumonside = (UINT8)GetSidePosition( response.usSide );
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
response.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
gDynamicOpinionSpeechEventVector.push_back( response );
gDynamicOpinionSpeechInCurrentDialogue.push_back( response );
@@ -682,7 +682,7 @@ void CreateSpeechEventsFromDynamicOpinionEvent( DynamicOpinionSpeechEvent aEvent
}
impinterference.usNumonside = (UINT8)GetSidePosition( impinterference.usSide );
impinterference.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.usDynamicDialogueTimeOffset;
impinterference.usStarttime = GetJA2Clock( ) + cnt * gGameExternalOptions.sDynamicDialogueTimeOffset;
gDynamicOpinionSpeechEventVector.push_back( impinterference );
gDynamicOpinionSpeechInCurrentDialogue.push_back( impinterference );
@@ -1085,7 +1085,7 @@ BOOLEAN DynamicOpinionTacticalCharacterDialogue( DynamicOpinionSpeechEvent& aEve
pDDBox->SetStartTime( aEvent.usStarttime );
// delay destruction of all current boxes - as long as new dialogue comes in, they will be kept
DelayBoxDestruction( aEvent.usStarttime + gGameExternalOptions.usDynamicDialogueTimeOffset * 3.5f );
DelayBoxDestruction( aEvent.usStarttime + gGameExternalOptions.sDynamicDialogueTimeOffset * 3.5f );
// on certain dialogues, we can choose an answer
if ( aEvent.ubEventType == DOST_INTERJECTOR_DIALOGUESELECTION )
@@ -1115,7 +1115,7 @@ BOOLEAN DynamicOpinionTacticalCharacterDialogue( DynamicOpinionSpeechEvent& aEve
IMPDialogueChooseBox_Static::getInstance( ).SetHelpText( szDynamicDialogueText_DOST_INTERJECTOR_DIALOGUESELECTION[aEvent.data.event.ubEventId] );
IMPDialogueChooseBox_Static::getInstance( ).Create( sX, sY + 60 );
IMPDialogueChooseBox_Static::getInstance( ).SetStartTime( aEvent.usStarttime );
IMPDialogueChooseBox_Static::getInstance( ).SetEndTime( aEvent.usStarttime + 2 * gGameExternalOptions.usDynamicDialogueTimeOffset );
IMPDialogueChooseBox_Static::getInstance( ).SetEndTime( aEvent.usStarttime + 2 * gGameExternalOptions.sDynamicDialogueTimeOffset );
}
return TRUE;