eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display encounter description in one line

This commit is contained in:
Alexander Batalov 2022-10-05 14:20:32 +03:00
parent 90942c46b2
commit 56d798dd12
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/worldmap.cc
View File

@ -3611,7 +3611,6 @@ static int wmRndEncounterPick()
int wmSetupRandomEncounter() int wmSetupRandomEncounter()
{ {
MessageListItem messageListItem; MessageListItem messageListItem;
char* msg;
if (wmGenData.encounterMapId == -1) { if (wmGenData.encounterMapId == -1) {
return 0; return 0;
@ -3620,12 +3619,13 @@ int wmSetupRandomEncounter()
EncounterTable* encounterTable = &(wmEncounterTableList[wmGenData.encounterTableId]); EncounterTable* encounterTable = &(wmEncounterTableList[wmGenData.encounterTableId]);
EncounterEntry* encounterTableEntry = &(encounterTable->entries[wmGenData.encounterEntryId]); EncounterEntry* encounterTableEntry = &(encounterTable->entries[wmGenData.encounterEntryId]);
// You encounter: // SFALL: Display encounter description in one line.
msg = getmsg(&wmMsgFile, &messageListItem, 2998); char formattedText[512];
displayMonitorAddMessage(msg); sprintf(formattedText,
"%s %s",
msg = getmsg(&wmMsgFile, &messageListItem, 3000 + 50 * wmGenData.encounterTableId + wmGenData.encounterEntryId); getmsg(&wmMsgFile, &messageListItem, 2998),
displayMonitorAddMessage(msg); getmsg(&wmMsgFile, &messageListItem, 3000 + 50 * wmGenData.encounterTableId + wmGenData.encounterEntryId));
displayMonitorAddMessage(formattedText);
int gameDifficulty; int gameDifficulty;
switch (encounterTableEntry->scenery) { switch (encounterTableEntry->scenery) {