Fixed an issue with file IDs of additional game msg files being shifted when a file in ExtraGameMsgFileList is missing.

Minor edit to the description of CityRepsList in ddraw.ini, to avoid misunderstanding.
Updated version number.
This commit is contained in:
NovaRain
2018-07-28 22:46:59 +08:00
parent 41c8722179
commit d0c97f7118
3 changed files with 7 additions and 5 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
;sfall configuration settings
;v4.0.7
;v4.0.8
[Main]
;Change to 1 if you want to use command line args to tell sfall to use another ini file.
@@ -375,7 +375,7 @@ UseScrollingQuestsList=1
;PremadeFIDs=201,203,202
;Use this line to modify the list of cities and their associated global variables used for city reputations
;Syntax is 'city id : global id', with each city/global pair separated by a comma.
;Syntax is 'city id:global id', with each city/global pair separated by a comma.
;CityRepsList=0:47,2:48,1:49,4:50,5:51,3:52,8:53,6:54,7:55,13:56,10:57,11:59,14:61,17:63,19:64,18:65,25:66,9:294,20:308
;Set this to a valid path to save a copy of the console contents
+3 -1
View File
@@ -66,14 +66,16 @@ char* GetMsg(fo::MessageList *msgList, int msgRef, int msgNum) {
void ReadExtraGameMsgFiles() {
auto msgFileList = GetConfigList("Misc", "ExtraGameMsgFileList", "", 512);
if (msgFileList.size() > 0) {
int number = 0;
for (auto& msgName : msgFileList) {
std::string path = "game\\" + msgName + ".msg";
fo::MessageList* list = new fo::MessageList();
if (fo::func::message_load(list, (char*)path.data()) == 1) {
gExtraGameMsgLists.insert(std::make_pair(0x2000 + gExtraGameMsgLists.size(), list));
gExtraGameMsgLists.insert(std::make_pair(0x2000 + number, list));
} else {
delete list;
}
number++;
}
}
}
+2 -2
View File
@@ -24,10 +24,10 @@
#define VERSION_MAJOR 4
#define VERSION_MINOR 0
#define VERSION_BUILD 7
#define VERSION_BUILD 8
#define VERSION_REV 0
#define VERSION_STRING "4.0.7"
#define VERSION_STRING "4.0.8"
#define CHECK_VAL (4)