From 61cc6695fbdb894ac9371fc2c72a1b1598303a29 Mon Sep 17 00:00:00 2001 From: Dave White Date: Tue, 25 Nov 2003 19:36:02 +0000 Subject: [PATCH] added new village image for first watch --- images/terrain/flag-neutral-first_watch.png | Bin 0 -> 9569 bytes src/editor/editor.cpp | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 images/terrain/flag-neutral-first_watch.png diff --git a/images/terrain/flag-neutral-first_watch.png b/images/terrain/flag-neutral-first_watch.png new file mode 100644 index 0000000000000000000000000000000000000000..9920f66a20dd12028d2607e6045bbc8821c7a413 GIT binary patch literal 9569 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 LNkvXXu0mjfB}8MP literal 0 HcmV?d00001 diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp index c3b826fbf7e..6c27a4d51e2 100644 --- a/src/editor/editor.cpp +++ b/src/editor/editor.cpp @@ -81,6 +81,12 @@ int main(int argc, char** argv) const font::manager font_manager; + std::vector terrain_names; + const std::vector terrains = map.get_terrain_precedence(); + for(std::vector::const_iterator t = terrains.begin(); t != terrains.end(); ++t) { + terrain_names.push_back(map.terrain_name(*t)); + } + std::cerr << "starting for(;;)\n"; for(;;) { if(key[SDLK_ESCAPE])