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

Merge remote branch 'upstream/master'

develop
doomchild 2011-04-01 09:48:44 -05:00
parent cb88d59358 6abd2d76bb
commit 21c4215cfe
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -17,7 +17,7 @@ SET(DFHACK_CONSISTENCY 1)
set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "5") set(CPACK_PACKAGE_VERSION_MINOR "5")
set(CPACK_PACKAGE_VERSION_PATCH "10") set(CPACK_PACKAGE_VERSION_PATCH "11")
set(DFHACK_REVISION "1") set(DFHACK_REVISION "1")
set(DFHACK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(DFHACK_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

3
Memory.xml
Unescape Escape View File

@ -2126,6 +2126,9 @@
<Offset name="biome_stuffs" value="0x1d80" /> <Offset name="biome_stuffs" value="0x1d80" />
</Group> </Group>
</Group> </Group>
<Group name="Materials">
<Address name="other" value="0x170d0e8" />
</Group>
<Group name="World"> <Group name="World">
<Address name="control_mode" value="0xb33814" /> <Address name="control_mode" value="0xb33814" />
<Address name="game_mode" value="0xb33818"/> <Address name="game_mode" value="0xb33818"/>

6
tools/examples/materialtest.cpp
Unescape Escape View File

@ -135,6 +135,12 @@ int main (int numargs, const char ** args)
} }
cout << endl; cout << endl;
} }
cout << endl << "----==== Other ====----" << endl;
Materials->ReadOthers ();
for(uint32_t i = 0; i < Materials->other.size();i++)
{
cout << i << ": " << Materials->other[i].rawname << endl;
}
#ifndef LINUX_BUILD #ifndef LINUX_BUILD
cout << "Done. Press any key to continue" << endl; cout << "Done. Press any key to continue" << endl;
cin.ignore(); cin.ignore();