Don't use globals

RosaryMala · RosaryMala · commit e3d95daf45f8 · 2018-01-26T08:19:41.000+05:30
diff --git a/library/xml b/library/xml
@@ -1 +1 @@
-Subproject commit 618db6349ece5827d371a60b0fac1066b1d7989b
+Subproject commit 9afe7c9538f1bfa104c5eff54b0945eee32a76cc
diff --git a/plugins/remotefortressreader/item_reader.cpp b/plugins/remotefortressreader/item_reader.cpp
@@ -1,4 +1,6 @@
 #include "item_reader.h"
+#include "Core.h"
+#include "VersionInfo.h"
 
 #include "df/art_image.h"
 #include "df/art_image_chunk.h"
@@ -104,9 +106,9 @@ void CopyImage(const df::art_image * image, ArtImage * netImage)
 
 void CopyImage(df::art_image_ref imageRef, ArtImage * netImage)
 {
-    if (df::global::getArtImage)
+    GET_IMAGE getImage = reinterpret_cast<GET_IMAGE>(Core::getInstance().vinfo->getAddress("rfr_get_art_image"));
+    if (getImage)
     {
-        df::art_image * (__thiscall *getImage)(df::world*, df::art_image_ref *, int *) = (df::art_image * (__thiscall*)(df::world*, df::art_image_ref *, int *))df::global::getArtImage;
         int subid = -1;
         CopyImage(getImage(world, &imageRef, &subid), netImage);
     }
diff --git a/plugins/remotefortressreader/item_reader.h b/plugins/remotefortressreader/item_reader.h
@@ -11,6 +11,9 @@ namespace df
 {
     struct item;
     struct map_block;
+    struct art_image;
+    struct art_image_ref;
+    struct world;
 }
 
 namespace MapExtras
@@ -22,4 +25,6 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
 void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem);
 void ConvertDFColorDescriptor(int16_t index, RemoteFortressReader::ColorDefinition * out);
 
+typedef df::art_image * (__thiscall *GET_IMAGE)(df::world*, df::art_image_ref *, int *);
+
 #endif // !ITEM_READER_H
diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp
@@ -17,6 +17,7 @@
 #include "SDL_events.h"
 #include "SDL_keyboard.h"
 #include "TileTypes.h"
+#include "VersionInfo.h"
 #if DF_VERSION_INT > 34011
 #include "DFHackVersion.h"
 #endif
@@ -191,10 +192,10 @@ command_result generate_image(color_ostream &out, vector <string> & parameters)
     imageRef.site_id = -1;
     imageRef.subid = -1;
 
-    if (df::global::getArtImage)
-    {
-        df::art_image * (__thiscall *getImage)(df::world*,df::art_image_ref *, int *) = (df::art_image * (__thiscall*)(df::world*, df::art_image_ref *, int *))df::global::getArtImage;
-        int subid = -1;
+        GET_IMAGE getImage = reinterpret_cast<GET_IMAGE>(Core::getInstance().vinfo->getAddress("rfr_get_art_image"));
+        if (getImage)
+        {
+            int subid = -1;
         auto image = getImage(world,&imageRef, &subid);
         out.print("Id: %d, subid: %d\n", image->id, image->subid);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`#include "item_reader.h"`
	`2`	`+#include "Core.h"`
	`3`	`+#include "VersionInfo.h"`
`2`	`4`
`3`	`5`	`#include "df/art_image.h"`
`4`	`6`	`#include "df/art_image_chunk.h"`
`@@ -104,9 +106,9 @@ void CopyImage(const df::art_image * image, ArtImage * netImage)`
`104`	`106`
`105`	`107`	`void CopyImage(df::art_image_ref imageRef, ArtImage * netImage)`
`106`	`108`	`{`
`107`		`- if (df::global::getArtImage)`
	`109`	`+ GET_IMAGE getImage = reinterpret_cast<GET_IMAGE>(Core::getInstance().vinfo->getAddress("rfr_get_art_image"));`
	`110`	`+ if (getImage)`
`108`	`111`	`{`
`109`		`- df::art_image * (__thiscall getImage)(df::world, df::art_image_ref , int ) = (df::art_image * (__thiscall)(df::world, df::art_image_ref , int ))df::global::getArtImage;`
`110`	`112`	`int subid = -1;`
`111`	`113`	`CopyImage(getImage(world, &imageRef, &subid), netImage);`
`112`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ namespace df`
`11`	`11`	`{`
`12`	`12`	`struct item;`
`13`	`13`	`struct map_block;`
	`14`	`+ struct art_image;`
	`15`	`+ struct art_image_ref;`
	`16`	`+ struct world;`
`14`	`17`	`}`
`15`	`18`
`16`	`19`	`namespace MapExtras`
`@@ -22,4 +25,6 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::`
`22`	`25`	`void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem);`
`23`	`26`	`void ConvertDFColorDescriptor(int16_t index, RemoteFortressReader::ColorDefinition * out);`
`24`	`27`
	`28`	`+typedef df::art_image * (__thiscall GET_IMAGE)(df::world, df::art_image_ref , int );`
	`29`	`+`
`25`	`30`	`#endif // !ITEM_READER_H`