diff options
| author | Weblate <42@minetest.ru> | 2013-06-21 10:24:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-21 10:24:16 +0200 |
| commit | 3af90db5b51da0c37f77fe6410e488c8c27acd67 (patch) | |
| tree | 12edd6f0661b464e36863517241b5ec0b87b5ec1 /src/emerge.h | |
| parent | 58f3cd3eb598a7cf79983fe9e48c738591c6e004 (diff) | |
| parent | b1ebd9f79c63cf78b0e0fb2ea6f52d82cdfb95b6 (diff) | |
| download | minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.tar.gz minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.tar.bz2 minetest-3af90db5b51da0c37f77fe6410e488c8c27acd67.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/emerge.h')
| -rw-r--r-- | src/emerge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/emerge.h b/src/emerge.h index b42e82d38..084956932 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -87,6 +87,7 @@ public: //Mapgen-related structures BiomeDefManager *biomedef; std::vector<Ore *> ores; + std::vector<Decoration *> decorations; EmergeManager(IGameDef *gamedef); ~EmergeManager(); |