diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp
index 278ee3942..c0521232b 100644
--- a/library/DFHackAPI.cpp
+++ b/library/DFHackAPI.cpp
@@ -411,7 +411,7 @@ try_again:
// store it in the vector
ices.push_back (fv);
}
- //#define ___FIND_
+ //#define ___FIND_THEM
#ifdef ___FIND_THEM
else if(g_pProcess->readClassName(type) == "block_square_event_frozen_liquid")
{
diff --git a/library/DFProcess-linux-wine.cpp b/library/DFProcess-linux-wine.cpp
index 6605b92dd..6a7aef8fa 100644
--- a/library/DFProcess-linux-wine.cpp
+++ b/library/DFProcess-linux-wine.cpp
@@ -146,7 +146,7 @@ bool WineProcess::Private::validate(char* exe_file, uint32_t pid, char* mem_file
my_descriptor = m;
my_handle = my_pid = pid;
// tell WineProcess about the /proc/PID/mem file
- this->memFile = memFile;
+ memFile = mem_file;
identified = true;
return true;
}
@@ -310,6 +310,7 @@ bool WineProcess::attach()
if(proc_pid_mem == -1)
{
ptrace(PTRACE_DETACH, d->my_handle, NULL, NULL);
+ cerr << d->memFile << endl;
cerr << "couldn't open /proc/" << d->my_handle << "/mem" << endl;
perror("open(memFile.c_str(),O_RDONLY)");
return false;
diff --git a/output/Memory.xml b/output/Memory.xml
index 097887d20..12984510a 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1098,7 +1098,7 @@
0xB0
-
+
0x4B6B7879
de66405f54d98297303d439b3b7aa30e
@@ -1307,68 +1307,9 @@
-
-
-
-
-
-
@@ -1417,6 +1358,276 @@
+
+
+
+
+ 0x4b81b00d
+ 5cdc6f4804809f4d5cacdb66785e8cda
+
+ 0x016D2DD4
+ 0x167B4C0
+ 0x168f858
+ 0x01695A2C
+ 0x168EEAC
+ 0x0168EFA0
+
+
+ 0x016D5184
+ 0x016D5154
+
+
+ 0x16D2DF4
+ 0x16D2DF8
+ 0x16D2DFC
+
+
+ 0x016D2E0C
+ 0x016D2E10
+ 0x016D2E14
+
+
+ 0x016D440C
+
+ 0x016D4F44
+
+ 0x9772b8
+ 0xDB1584
+ 0xDDF630
+ 0xDDF60C
+ 0x1817EE8
+ 0x977438
+ 0x014AD278
+ 0x014C09BC
+ 0x01828F8C
+
+ 0x014C069C
+ 0x014C06D4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
.-"""-.
' \
|,. ,-. |