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

Tiny type fixes for spatter veins, updated df2mc.

develop
Petr Mrázek 2011-10-30 15:25:29 +01:00
parent d6ed4b875a
commit 063894276c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/include/dfhack/modules/Maps.h
Unescape Escape View File

@ -36,6 +36,7 @@ distribution.
#include <vector> #include <vector>
#include "dfhack/Virtual.h" #include "dfhack/Virtual.h"
#include "dfhack/BitArray.h" #include "dfhack/BitArray.h"
#include "Materials.h"
/** /**
* \defgroup grp_maps Maps module and its types * \defgroup grp_maps Maps module and its types
@ -219,11 +220,9 @@ namespace DFHack
struct t_spattervein : public t_virtual struct t_spattervein : public t_virtual
{ {
/// generic material. /// generic material.
uint16_t mat1; t_materialType mat1;
/// possibly alignment artifact
uint16_t unk1;
/// material vector index /// material vector index
uint32_t mat2; t_materialIndex mat2;
/** /**
* matter state - liquid/solid/etc. * matter state - liquid/solid/etc.
* @ref e_matter_state * @ref e_matter_state
@ -240,7 +239,7 @@ namespace DFHack
struct t_grassvein : public t_virtual struct t_grassvein : public t_virtual
{ {
/// material vector index /// material vector index
uint32_t material; t_materialIndex material;
/// 16x16 array of covering 'intensity' /// 16x16 array of covering 'intensity'
uint8_t intensity[16][16]; uint8_t intensity[16][16];
}; };

2
plugins/df2mc

@ -1 +1 @@
Subproject commit 604eb2c89fbe540ba26985d55aecaea3f899bef7 Subproject commit f23b5c29119f0e3621da66ac621f1993948be555