From 56d798dd12d8b0cd0eac7551cdce9710c95de3c2 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Wed, 5 Oct 2022 14:20:32 +0300 Subject: [PATCH] Display encounter description in one line --- src/worldmap.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/worldmap.cc b/src/worldmap.cc index a5aa889..29ac535 100644 --- a/src/worldmap.cc +++ b/src/worldmap.cc @@ -3611,7 +3611,6 @@ static int wmRndEncounterPick() int wmSetupRandomEncounter() { MessageListItem messageListItem; - char* msg; if (wmGenData.encounterMapId == -1) { return 0; @@ -3620,12 +3619,13 @@ int wmSetupRandomEncounter() EncounterTable* encounterTable = &(wmEncounterTableList[wmGenData.encounterTableId]); EncounterEntry* encounterTableEntry = &(encounterTable->entries[wmGenData.encounterEntryId]); - // You encounter: - msg = getmsg(&wmMsgFile, &messageListItem, 2998); - displayMonitorAddMessage(msg); - - msg = getmsg(&wmMsgFile, &messageListItem, 3000 + 50 * wmGenData.encounterTableId + wmGenData.encounterEntryId); - displayMonitorAddMessage(msg); + // SFALL: Display encounter description in one line. + char formattedText[512]; + sprintf(formattedText, + "%s %s", + getmsg(&wmMsgFile, &messageListItem, 2998), + getmsg(&wmMsgFile, &messageListItem, 3000 + 50 * wmGenData.encounterTableId + wmGenData.encounterEntryId)); + displayMonitorAddMessage(formattedText); int gameDifficulty; switch (encounterTableEntry->scenery) {