[Scummvm-git-logs] scummvm master -> e2f4f0e15b6733814d9537662b082f5e534bfca0

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e2f4f0e15b DEVTOOLS: Avoid global constructor


Commit: e2f4f0e15b6733814d9537662b082f5e534bfca0
    https://github.com/scummvm/scummvm/commit/e2f4f0e15b6733814d9537662b082f5e534bfca0
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-01-01T16:28:11+01:00

Commit Message:
DEVTOOLS: Avoid global constructor

Changed paths:
    devtools/create_neverhood/create_neverhood.cpp


diff --git a/devtools/create_neverhood/create_neverhood.cpp b/devtools/create_neverhood/create_neverhood.cpp
index b1ec5fb0e03..922fdba0c99 100644
--- a/devtools/create_neverhood/create_neverhood.cpp
+++ b/devtools/create_neverhood/create_neverhood.cpp
@@ -519,20 +519,22 @@ public:
 
 };
 
-StaticDataListVector<HitRectList> hitRectLists;
-StaticDataListVector<RectList> rectLists;
-StaticDataListVector<MessageList> messageLists;
-StaticDataListVector<NavigationList> navigationLists;
-StaticDataVector<SceneInfo140Item> sceneInfo140Items;
-StaticDataVector<SceneInfo2700Item> sceneInfo2700Items;
+StaticDataListVector<MessageList> *messageLists;
 
 void addMessageList(uint32 messageListCount, uint32 messageListOffset) {
 	MessageList *messageList = new MessageList();
 	messageList->loadList(messageListCount, messageListOffset);
-	messageLists.add(messageList);
+	messageLists->add(messageList);
 }
 
 int main(int argc, char *argv[]) {
+	StaticDataListVector<HitRectList> hitRectLists;
+	StaticDataListVector<RectList> rectLists;
+	StaticDataListVector<NavigationList> navigationLists;
+	StaticDataVector<SceneInfo140Item> sceneInfo140Items;
+	StaticDataVector<SceneInfo2700Item> sceneInfo2700Items;
+
+	messageLists = new StaticDataListVector<MessageList>;
 
 	if (!loadExe("nhc.exe") ||
 		!validateMd5())
@@ -542,7 +544,7 @@ int main(int argc, char *argv[]) {
 
 	hitRectLists.loadListVector(hitRectListOffsets);
 	rectLists.loadListVector(rectListOffsets);
-	messageLists.loadListVector(messageListOffsets);
+	messageLists->loadListVector(messageListOffsets);
 	navigationLists.loadListVector(navigationListOffsets);
 	sceneInfo140Items.loadVector(sceneInfo140Offsets);
 	sceneInfo2700Items.loadVector(sceneInfo2700Offsets);
@@ -552,13 +554,14 @@ int main(int argc, char *argv[]) {
 	writeUint32LE(datFile, 0x11223344); // Some magic
 	writeUint32LE(datFile, DAT_VERSION);
 
-	messageLists.saveListVector(datFile);
+	messageLists->saveListVector(datFile);
 	rectLists.saveListVector(datFile);
 	hitRectLists.saveListVector(datFile);
 	navigationLists.saveListVector(datFile);
 	sceneInfo140Items.saveVector(datFile);
 	sceneInfo2700Items.saveVector(datFile);
 
+	delete messageLists;
 	fclose(datFile);
 
 	printf("Done.\n");