MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Got the image reader function working.

develop
Japa 2018-01-25 20:24:12 +05:30
parent f1b8fa305b
commit ef451a2f2d
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/remotefortressreader/item_reader.cpp
Unescape Escape View File

@ -106,9 +106,9 @@ void CopyImage(df::art_image_ref imageRef, ArtImage * netImage)
{ {
if (df::global::getArtImage) if (df::global::getArtImage)
{ {
df::art_image * (*getImage)(df::art_image_ref *, int *) = (df::art_image * (*)(df::art_image_ref *, int *))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; int subid = -1;
CopyImage(getImage(&imageRef, &subid), netImage); CopyImage(getImage(world, &imageRef, &subid), netImage);
} }
else else
{ {
@ -456,7 +456,7 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
NetItem->set_volume(DfItem->getVolume()); NetItem->set_volume(DfItem->getVolume());
} }
DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::EmptyMessage *in, RemoteFortressReader::MaterialList *out) DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::EmptyMessage *in, RemoteFortressReader::MaterialList *out)
{ {
if (!Core::getInstance().isWorldLoaded()) { if (!Core::getInstance().isWorldLoaded()) {
//out->set_available(false); //out->set_available(false);

23
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -179,6 +179,28 @@ const char* growth_locations[] = {
}; };
#define GROWTH_LOCATIONS_SIZE 8 #define GROWTH_LOCATIONS_SIZE 8
#include "df/art_image.h"
#include "df/art_image_chunk.h"
#include "df/art_image_ref.h"
command_result generate_image(color_ostream &out, vector <string> & parameters)
{
df::art_image_ref imageRef;
imageRef.civ_id = -1;
imageRef.id = -1;
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;
auto image = getImage(world,&imageRef, &subid);
out.print("Id: %d, subid: %d\n", image->id, image->subid);
}
return CR_OK;
}
command_result dump_bp_mods(color_ostream &out, vector <string> & parameters) command_result dump_bp_mods(color_ostream &out, vector <string> & parameters)
{ {
remove("bp_appearance_mods.csv"); remove("bp_appearance_mods.csv");
@ -249,6 +271,7 @@ DFhackCExport command_result plugin_init(color_ostream &out, std::vector <Plugin
" Does nothing.\n" " Does nothing.\n"
)); ));
commands.push_back(PluginCommand("RemoteFortressReader_version", "List the loaded RemoteFortressReader version", RemoteFortressReader_version, false, "This is used for plugin version checking.")); commands.push_back(PluginCommand("RemoteFortressReader_version", "List the loaded RemoteFortressReader version", RemoteFortressReader_version, false, "This is used for plugin version checking."));
commands.push_back(PluginCommand("generate_image", "make a random image struct.", generate_image, false, "..."));
enableUpdates = true; enableUpdates = true;
return CR_OK; return CR_OK;
} }