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

Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9'

develop
lethosor 2015-01-05 16:40:44 -05:00
parent 57f6a94133 5a404333ca 3c0ac70615
commit 06029c92c2
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/modules/Filesystem.cpp
Unescape Escape View File

@ -130,7 +130,6 @@ _filetype DFHack::Filesystem::filetype (std::string path)
{ {
STAT_STRUCT info; STAT_STRUCT info;
DFHack::Filesystem::stat(path, info); DFHack::Filesystem::stat(path, info);
std::cout << info.st_mode << std::endl;
return mode2type(info.st_mode); return mode2type(info.st_mode);
} }

38
scripts/devel/export-dt-ini.lua
Unescape Escape View File

@ -429,27 +429,25 @@ out:write[[
size=0 size=0
[invalid_flags_1] [invalid_flags_1]
size=10 size=9
1\name=a zombie 1\name=a skeleton
1\value=0x00001000 1\value=0x00002000
2\name=a skeleton 2\name=a merchant
2\value=0x00002000 2\value=0x00000040
3\name=a merchant 3\name=outpost liason or diplomat
3\value=0x00000040 3\value=0x00000800
4\name=outpost liason or diplomat 4\name=an invader or hostile
4\value=0x00000800 4\value=0x00020000
5\name=an invader or hostile 5\name=an invader or hostile
5\value=0x00020000 5\value=0x00080000
6\name=an invader or hostile 6\name=resident, invader or ambusher
6\value=0x00080000 6\value=0x00600000
7\name=resident, invader or ambusher 7\name=part of a merchant caravan
7\value=0x00600000 7\value=0x00000080
8\name=part of a merchant caravan 8\name="Dead, Jim."
8\value=0x00000080 8\value=0x00000002
9\name="Dead, Jim." 9\name=marauder
9\value=0x00000002 9\value=0x00000010
10\name=marauder
10\value=0x00000010
[invalid_flags_2] [invalid_flags_2]
size=5 size=5