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

- New Quest: if Kingpin is unaware Maria escaped with the player's help, he enlists the player to kill the DaSilvas

Browse Source 
- Moved civ factions for mod compatibility (UC)

Does not break savegame compatibility.
Requires GameDir >= r2252.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-06-13 17:26:16 +00:00
parent e77f8f2bd6
commit eff368f099
18 changed files with 467 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/history.cpp
+14 -14
View File
@@ -656,9 +656,9 @@ UINT32 ProcessAndEnterAHistoryRecord( UINT8 ubCode, UINT32 uiDate, UINT8 ubSecon
pHistory = pHistory->Next;
pHistory->Next = NULL;
pHistory->ubCode = ubCode;
pHistory->ubSecondCode = ubSecondCode;
pHistory->ubSecondCode = ubSecondCode;
pHistory->uiDate = uiDate;
pHistory->uiIdNumber = uiId;
pHistory->uiIdNumber = uiId;
pHistory->sSectorX = sSectorX;
pHistory->sSectorY = sSectorY;
pHistory->bSectorZ = bSectorZ;
@@ -673,10 +673,10 @@ UINT32 ProcessAndEnterAHistoryRecord( UINT8 ubCode, UINT32 uiDate, UINT8 ubSecon
// setup info passed
pHistory->Next = NULL;
pHistory->ubCode = ubCode;
pHistory->ubSecondCode = ubSecondCode;
pHistory->ubSecondCode = ubSecondCode;
pHistory->uiDate = uiDate;
pHistory->uiIdNumber = uiId;
pHistoryListHead = pHistory;
pHistory->uiIdNumber = uiId;
pHistoryListHead = pHistory;
pHistory->sSectorX = sSectorX;
pHistory->sSectorY = sSectorY;
pHistory->bSectorZ = bSectorZ;
@@ -900,7 +900,7 @@ void DrawHistoryRecordsText( void )
// loop through record list
for(iCounter; iCounter <NUM_RECORDS_PER_PAGE; iCounter++)
for(iCounter; iCounter <NUM_RECORDS_PER_PAGE; ++iCounter)
{
if( pCurHistory->ubColor == 0 )
{
@@ -910,6 +910,7 @@ void DrawHistoryRecordsText( void )
{
SetFontForeground(FONT_RED);
}
// get and write the date
swprintf(sString, L"%d", ( pCurHistory->uiDate / ( 24 * 60 ) ) );
FindFontCenterCoordinates(RECORD_DATE_X + 5, 0, RECORD_DATE_WIDTH,0, sString, HISTORY_TEXT_FONT,&usX, &usY);
@@ -920,14 +921,13 @@ void DrawHistoryRecordsText( void )
ProcessHistoryTransactionString(sString, pCurHistory);
// mprintf(RECORD_DATE_X + RECORD_DATE_WIDTH + 25, RECORD_Y + ( iCounter * ( BOX_HEIGHT ) ) + 3, pHistoryStrings[pCurHistory->ubCode] );
mprintf(RECORD_DATE_X + RECORD_LOCATION_WIDTH +RECORD_DATE_WIDTH + 15, RECORD_Y + ( iCounter * ( BOX_HEIGHT ) ) + 3, sString );
// no location
if( ( pCurHistory->sSectorX == -1 )||( pCurHistory->sSectorY == -1 ) )
{
FindFontCenterCoordinates( RECORD_DATE_X + RECORD_DATE_WIDTH, 0,RECORD_LOCATION_WIDTH + 10, 0, pHistoryLocations[0] ,HISTORY_TEXT_FONT, &sX, &sY );
mprintf(sX, RECORD_Y + ( iCounter * ( BOX_HEIGHT ) ) + 3, pHistoryLocations[0] );
}
mprintf(sX, RECORD_Y + ( iCounter * ( BOX_HEIGHT ) ) + 3, pHistoryLocations[0] );
}
else
{
GetSectorIDString( pCurHistory->sSectorX, pCurHistory->sSectorY, pCurHistory->bSectorZ, sString, TRUE );
@@ -947,17 +947,14 @@ void DrawHistoryRecordsText( void )
// last page, no Historys left, return
if( ! pCurHistory )
{
// restore shadow
SetFontShadow(DEFAULT_SHADOW);
SetFontShadow(DEFAULT_SHADOW);
return;
}
}
// restore shadow
SetFontShadow(DEFAULT_SHADOW);
return;
}
@@ -1269,6 +1266,9 @@ void ProcessHistoryTransactionString(STR16 pString, HistoryUnitPtr pHistory)
//swprintf( pString, pHistoryStrings[ pHistory->ubCode ], pHistory->ubSecondCode );
swprintf( pString, HistoryName[ pHistory->ubCode ].sHistory, pHistory->ubSecondCode );
break;
default:
swprintf( pString, L"missing text, kinda" );
break;
}
}