[[Animation and layering fixes]]
* Added proper support for animated time-of-day alternative images * Fixed 'layers' not working as intended in built terrains * Added sample (read: ugly) animated villages as an illustration.
This commit is contained in:
Philippe Plantier
parent
5422330e9b
commit
47dd717978
15 changed files with 395 additions and 162 deletions
|
|
@ -4,9 +4,9 @@
|
|||
ggggggggggggggggggggggggggggggggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
ggggggg1Cgggggggggfffffgggggggggggggg
|
||||
ggggggggCgggggggggfffffgggggggggggggg
|
||||
ggggggggggggggggggfffffgggggggggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
ggggggggCgggggggggfffffgggccccggggggg
|
||||
ggggggggggggggggggfffffgggcchhggggggg
|
||||
ggggggggggggggggggggggggggccccggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
|
|
@ -16,8 +16,8 @@ ggggggggggggggggggggggggggggggggggggg
|
|||
ggnnKnggggggggggggggggggggggggggggggg
|
||||
gggnngggggggggggggggggggggggggggggggg
|
||||
gggggggggggggggggggggggggggg2gggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
gggggggDgggggtggggggggggggggggggggggg
|
||||
ggggggDgggtgggggggggggggggggggggggggg
|
||||
ggggggggggggggggggggggggggggggggggggg
|
||||
"
|
||||
turns=36
|
||||
|
|
|
|||
|
|
@ -94,7 +94,39 @@
|
|||
{TERRAIN_BASE D cave}
|
||||
{BUILDING D village-cave}
|
||||
{TERRAIN_BASE t grassland}
|
||||
{BUILDING t village}
|
||||
# {BUILDING t village}
|
||||
|
||||
[terrain_graphics]
|
||||
[tile]
|
||||
//loc=0,0
|
||||
x=0
|
||||
y=0
|
||||
type=t
|
||||
[image]
|
||||
layer=-98
|
||||
name=village
|
||||
[variant]
|
||||
tod=dusk
|
||||
name=village-dusk,village-dusk2,village-dusk3,village-dusk4
|
||||
[/variant]
|
||||
[variant]
|
||||
tod=first_watch
|
||||
name=village-dusk,village-dusk2,village-dusk3,village-dusk4
|
||||
[/variant]
|
||||
[variant]
|
||||
tod=second_watch
|
||||
name=village-dusk,village-dusk2,village-dusk3,village-dusk4
|
||||
[/variant]
|
||||
[variant]
|
||||
tod=dawn
|
||||
name=village-dusk,village-dusk2,village-dusk3,village-dusk4
|
||||
[/variant]
|
||||
[/image]
|
||||
[/tile]
|
||||
set_flag=building
|
||||
no_flag=building
|
||||
precedence=16
|
||||
[/terrain_graphics]
|
||||
|
||||
|
||||
#
|
||||
|
|
@ -120,7 +152,7 @@ K
|
|||
# not_flag=terrain-base
|
||||
# set_flag=terrain-base
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name=dirt
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -196,7 +228,7 @@ K
|
|||
# set_flag="built-m"
|
||||
#
|
||||
# [image]
|
||||
# z_index=-99
|
||||
# layer=-99
|
||||
# name="mountains-test"
|
||||
# [/image]
|
||||
#[/terrain_graphics]
|
||||
|
|
@ -207,7 +239,7 @@ K
|
|||
# y=0
|
||||
# type=m
|
||||
# [image]
|
||||
# z_index=-99
|
||||
# layer=-99
|
||||
# name="mountains-test-2"
|
||||
# [/image]
|
||||
# [/tile]
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
no_flag=transition-s
|
||||
set_flag=transition-s
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}-s
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
no_flag=transition-se
|
||||
set_flag=transition-se
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}-se
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
no_flag=transition-sw
|
||||
set_flag=transition-sw
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}-sw
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
set_flag=transition-@R0,transition-@R1,transition-@R2,transition-@R3
|
||||
|
||||
[image]
|
||||
z_index=-98
|
||||
layer=-98
|
||||
name={IMAGE}-@R0-@R1-@R2-@R3
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
set_flag=transition-@R0,transition-@R1,transition-@R2
|
||||
|
||||
[image]
|
||||
z_index=-98
|
||||
layer=-98
|
||||
name={IMAGE}-@R0-@R1-@R2
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
set_flag=transition-@R0,transition-@R1
|
||||
|
||||
[image]
|
||||
z_index=-98
|
||||
layer=-98
|
||||
name={IMAGE}-@R0-@R1
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
set_flag=transition-@R0
|
||||
|
||||
[image]
|
||||
z_index=-98
|
||||
layer=-98
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
y=0
|
||||
type="{LETTER}"
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
||||
probability={PROBABILITY}
|
||||
no_flag="terrain-{LETTER}"
|
||||
set_flag="terrain-{LETTER}"
|
||||
no_flag="terrain-base"
|
||||
set_flag="terrain-base"
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
y=0
|
||||
type={LETTER}
|
||||
[image]
|
||||
z_index=-98
|
||||
layer=-98
|
||||
name={IMAGE}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
type={KEEP}
|
||||
has_flag={FLAG}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
type={KEEP}
|
||||
probability={PROBABILITY}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={BACKGROUND}
|
||||
[/image]
|
||||
set_flag="terrain-{FOREST}"
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={BACKGROUND}
|
||||
[/image]
|
||||
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={BACKGROUND}
|
||||
[/image]
|
||||
set_flag="terrain-{FOREST}"
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={FOREGROUND}-nw-n-ne
|
||||
[/image]
|
||||
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={FOREGROUND}-nw-n
|
||||
[/image]
|
||||
set_flag=castle-transition-nw,castle-transition-n
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={FOREGROUND}-n-ne
|
||||
[/image]
|
||||
set_flag=castle-transition-n,castle-transition-ne
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
set_flag=castle-transition-n
|
||||
no_flag=castle-transition-n
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={FOREGROUND}-n
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
set_flag=castle-transition-nw
|
||||
no_flag=castle-transition-nw
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={FOREGROUND}-nw
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -215,7 +215,7 @@
|
|||
set_flag=castle-transition-ne
|
||||
no_flag=castle-transition-ne
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={FOREGROUND}-ne
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{IMAGE}-bg-concave-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{IMAGE}-fg-concave-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -46,11 +46,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{IMAGE}-bg-convex-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{IMAGE}-fg-convex-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
# not_flag=terrain-base
|
||||
# set_flag=terrain-base
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
# set_flag=terrain-base
|
||||
has_flag=keep-of-{CASTLE}
|
||||
[image]
|
||||
z_index=-99
|
||||
layer=-99
|
||||
name={IMAGE}
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -115,11 +115,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{KEEP_IMAGE}-bg-inside-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{KEEP_IMAGE}-fg-inside-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -142,11 +142,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{KEEP_IMAGE}-bg-wall-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{KEEP_IMAGE}-fg-wall-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -174,11 +174,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{KEEP_IMAGE}-bg-wall-0-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{KEEP_IMAGE}-fg-wall-0-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -205,11 +205,11 @@
|
|||
type=!{CASTLE}{KEEP}
|
||||
[/tile]
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{KEEP_IMAGE}-bg-wall-1-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{KEEP_IMAGE}-fg-wall-1-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -241,11 +241,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{CASTLE_IMAGE}-bg-concave-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{CASTLE_IMAGE}-fg-concave-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -267,11 +267,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{CASTLE_IMAGE}-bg-convex-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{CASTLE_IMAGE}-fg-convex-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
@ -294,11 +294,11 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
z_index=-1
|
||||
layer=-99
|
||||
name="{CASTLE_IMAGE}-bg-convex-@R0"
|
||||
[/image]
|
||||
[image]
|
||||
z_index=1
|
||||
layer=1
|
||||
name="{CASTLE_IMAGE}-fg-convex-@R0"
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
|
|
|
|||
BIN
images/terrain/village-dusk2.png
Normal file
BIN
images/terrain/village-dusk2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
images/terrain/village-dusk3.png
Normal file
BIN
images/terrain/village-dusk3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
images/terrain/village-dusk4.png
Normal file
BIN
images/terrain/village-dusk4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
321
src/builder.cpp
321
src/builder.cpp
|
|
@ -42,16 +42,49 @@ image::locator locator_string_initializer::operator()(const std::string &s) cons
|
|||
|
||||
}
|
||||
|
||||
terrain_builder::tile::tile()
|
||||
terrain_builder::tile::tile() : last_tod("invalid_tod")
|
||||
{
|
||||
memset(adjacents, 0, sizeof(adjacents));
|
||||
}
|
||||
|
||||
void terrain_builder::tile::rebuild_cache(const std::string &tod) const
|
||||
{
|
||||
images_background.clear();
|
||||
images_foreground.clear();
|
||||
|
||||
std::multimap<int, const rule_image*>::const_iterator itor;
|
||||
|
||||
util::array<std::string, 2> search_variants;
|
||||
search_variants[0] = tod;
|
||||
|
||||
for(itor = images.begin(); itor != images.end(); ++itor) {
|
||||
|
||||
for(util::array<std::string, 2>::const_iterator var_name = search_variants.begin();
|
||||
var_name != search_variants.end(); ++var_name) {
|
||||
|
||||
rule_image_variantlist::const_iterator tod_variant =
|
||||
itor->second->variants.find(*var_name);
|
||||
|
||||
if(tod_variant != itor->second->variants.end()) {
|
||||
if(itor->first < 0) {
|
||||
images_background.push_back(tod_variant->second.image);
|
||||
} else {
|
||||
images_foreground.push_back(tod_variant->second.image);
|
||||
}
|
||||
|
||||
break; // break the "variant search" loop
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void terrain_builder::tile::clear()
|
||||
{
|
||||
flags.clear();
|
||||
images.clear();
|
||||
images_foreground.clear();
|
||||
images_background.clear();
|
||||
last_tod = "invalid_tod";
|
||||
memset(adjacents, 0, sizeof(adjacents));
|
||||
}
|
||||
|
||||
|
|
@ -92,19 +125,26 @@ terrain_builder::terrain_builder(const config& cfg, const gamemap& gmap) :
|
|||
}
|
||||
|
||||
const terrain_builder::imagelist *terrain_builder::get_terrain_at(const gamemap::location &loc,
|
||||
ADJACENT_TERRAIN_TYPE terrain_type) const
|
||||
const std::string &tod, ADJACENT_TERRAIN_TYPE terrain_type) const
|
||||
{
|
||||
if(!tile_map_.on_map(loc))
|
||||
return NULL;
|
||||
|
||||
const tile& tile_at = tile_map_[loc];
|
||||
|
||||
if(tod != tile_at.last_tod) {
|
||||
tile_at.rebuild_cache(tod);
|
||||
tile_at.last_tod = tod;
|
||||
}
|
||||
|
||||
if(terrain_type == ADJACENT_BACKGROUND) {
|
||||
if(tile_map_[loc].images_background.size())
|
||||
return &tile_map_[loc].images_background;
|
||||
if(!tile_at.images_background.empty())
|
||||
return &tile_at.images_background;
|
||||
}
|
||||
|
||||
if(terrain_type == ADJACENT_FOREGROUND) {
|
||||
if(tile_map_[loc].images_foreground.size())
|
||||
return &tile_map_[loc].images_foreground;
|
||||
if(!tile_at.images_foreground.empty())
|
||||
return &tile_at.images_foreground;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
|
@ -152,9 +192,105 @@ void terrain_builder::rebuild_all() {
|
|||
build_terrains();
|
||||
}
|
||||
|
||||
bool terrain_builder::rule_valid(const building_rule &rule)
|
||||
{
|
||||
//if the rule has no constraints, it is invalid
|
||||
if(rule.constraints.empty())
|
||||
return false;
|
||||
|
||||
//checks if all the images referenced by the current rule are valid.
|
||||
//if not, this rule will not match.
|
||||
rule_imagelist::const_iterator image;
|
||||
constraint_set::const_iterator constraint;
|
||||
rule_image_variantlist::const_iterator variant;
|
||||
|
||||
#if 0
|
||||
for(image = rule.images.begin();
|
||||
image != rule.images.end(); ++image) {
|
||||
|
||||
for(variant = image->variants.begin(); variant != image->variants.end(); ++variant) {
|
||||
|
||||
std::string s = variant->second.image_string;
|
||||
s = s.substr(0, s.find_first_of(",:"));
|
||||
|
||||
if(!image::exists("terrain/" + s + ".png"))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
for(constraint = rule.constraints.begin();
|
||||
constraint != rule.constraints.end(); ++constraint) {
|
||||
for(image = constraint->second.images.begin();
|
||||
image != constraint->second.images.end();
|
||||
++image) {
|
||||
|
||||
for(variant = image->variants.begin(); variant != image->variants.end(); ++variant) {
|
||||
std::string s = variant->second.image_string;
|
||||
s = s.substr(0, s.find_first_of(",:"));
|
||||
|
||||
if(!image::exists("terrain/" + s + ".png"))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool terrain_builder::start_animation(building_rule &rule)
|
||||
{
|
||||
rule_imagelist::iterator image;
|
||||
constraint_set::iterator constraint;
|
||||
rule_image_variantlist::iterator variant;
|
||||
|
||||
for(constraint = rule.constraints.begin();
|
||||
constraint != rule.constraints.end(); ++constraint) {
|
||||
|
||||
#if 0
|
||||
for(image = rule.images.begin();
|
||||
image != rule.images.end(); ++image) {
|
||||
|
||||
for(variant = image->variants.begin(); variant != image->variants.end(); ++variant) {
|
||||
|
||||
animated<image::locator> th(variant->second.image_string,
|
||||
locator_string_initializer());
|
||||
|
||||
variant->second.image = th;
|
||||
variant->second.image.start_animation(0, animated<image::locator>::INFINITE_CYCLES);
|
||||
variant->second.image.update_current_frame();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
for(image = constraint->second.images.begin();
|
||||
image != constraint->second.images.end();
|
||||
++image) {
|
||||
|
||||
for(variant = image->variants.begin(); variant != image->variants.end(); ++variant) {
|
||||
|
||||
locator_string_initializer initializer;
|
||||
|
||||
if(image->global_image) {
|
||||
initializer = locator_string_initializer(constraint->second.loc);
|
||||
}
|
||||
|
||||
animated<image::locator> th(variant->second.image_string,
|
||||
initializer);
|
||||
|
||||
variant->second.image = th;
|
||||
variant->second.image.start_animation(0, animated<image::locator>::INFINITE_CYCLES);
|
||||
variant->second.image.update_current_frame();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
terrain_builder::terrain_constraint terrain_builder::rotate(const terrain_builder::terrain_constraint &constraint, int angle)
|
||||
{
|
||||
static struct { int ii; int ij; int ji; int jj; } rotations[6] =
|
||||
static const struct { int ii; int ij; int ji; int jj; } rotations[6] =
|
||||
{ { 1, 0, 0, 1 }, { 1, 1, -1, 0 }, { 0, 1, -1, -1 },
|
||||
{ -1, 0, 0, -1 }, { -1, -1, 1, 0 }, { 0, -1, 1, 1 } };
|
||||
|
||||
|
|
@ -189,11 +325,26 @@ void terrain_builder::replace_token(std::string &s, const std::string &token, co
|
|||
}
|
||||
}
|
||||
|
||||
void terrain_builder::replace_token(terrain_builder::rule_image_variant &variant, const std::string &token, const std::string &replacement)
|
||||
{
|
||||
replace_token(variant.image_string, token, replacement);
|
||||
}
|
||||
|
||||
void terrain_builder::replace_token(terrain_builder::rule_image &image, const std::string &token, const std::string &replacement)
|
||||
{
|
||||
rule_image_variantlist::iterator itor;
|
||||
|
||||
for(itor = image.variants.begin(); itor != image.variants.end(); ++itor) {
|
||||
replace_token(itor->second, token, replacement);
|
||||
}
|
||||
}
|
||||
|
||||
void terrain_builder::replace_token(terrain_builder::rule_imagelist &list, const std::string &token, const std::string &replacement)
|
||||
{
|
||||
for(rule_imagelist::iterator itor = list.begin(); itor != list.end(); ++itor) {
|
||||
replace_token(itor->second, token, replacement);
|
||||
replace_token(itor->second, token, replacement);
|
||||
rule_imagelist::iterator itor;
|
||||
|
||||
for(itor = list.begin(); itor != list.end(); ++itor) {
|
||||
replace_token(*itor, token, replacement);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -217,7 +368,7 @@ void terrain_builder::replace_token(terrain_builder::building_rule &rule, const
|
|||
replace_token(cons->second.images, token, replacement);
|
||||
}
|
||||
|
||||
replace_token(rule.images, token, replacement);
|
||||
//replace_token(rule.images, token, replacement);
|
||||
}
|
||||
|
||||
terrain_builder::building_rule terrain_builder::rotate_rule(const terrain_builder::building_rule &rule,
|
||||
|
|
@ -228,7 +379,9 @@ terrain_builder::building_rule terrain_builder::rotate_rule(const terrain_builde
|
|||
std::cerr << "Error: invalid rotations\n";
|
||||
return ret;
|
||||
}
|
||||
#if 0
|
||||
ret.images = rule.images;
|
||||
#endif
|
||||
ret.location_constraints = rule.location_constraints;
|
||||
ret.probability = rule.probability;
|
||||
ret.precedence = rule.precedence;
|
||||
|
|
@ -272,16 +425,41 @@ terrain_builder::building_rule terrain_builder::rotate_rule(const terrain_builde
|
|||
return ret;
|
||||
}
|
||||
|
||||
void terrain_builder::add_images_from_config(rule_imagelist& images, const config &cfg)
|
||||
void terrain_builder::add_images_from_config(rule_imagelist& images, const config &cfg, bool global)
|
||||
{
|
||||
const config::child_list& cimages = cfg.get_children("image");
|
||||
|
||||
#if 0
|
||||
for(config::child_list::const_iterator itor = cimages.begin(); itor != cimages.end(); ++itor) {
|
||||
const int z_index = atoi((**itor)["z_index"].c_str());
|
||||
const std::string &name = (**itor)["name"];
|
||||
|
||||
images.insert(std::pair<int, std::string>(z_index, name));
|
||||
}
|
||||
#endif
|
||||
|
||||
for(config::child_list::const_iterator img = cimages.begin(); img != cimages.end(); ++img) {
|
||||
|
||||
// Adds the main (default) variant of the image, if present
|
||||
const int layer = atoi((**img)["layer"].c_str());
|
||||
const std::string &name = (**img)["name"];
|
||||
|
||||
images.push_back(rule_image(layer, global));
|
||||
|
||||
images.back().variants.insert(std::pair<std::string, rule_image_variant>("", rule_image_variant(name,"")));
|
||||
|
||||
// Adds the other variants of the image
|
||||
const config::child_list& variants = (**img).get_children("variant");
|
||||
|
||||
for(config::child_list::const_iterator variant = variants.begin();
|
||||
variant != variants.end(); ++variant) {
|
||||
const std::string &name = (**variant)["name"];
|
||||
const std::string &tod = (**variant)["tod"];
|
||||
|
||||
images.back().variants.insert(std::pair<std::string, rule_image_variant>(tod, rule_image_variant(name,tod)));
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void terrain_builder::add_constraints(std::map<gamemap::location, terrain_builder::terrain_constraint> & constraints,
|
||||
|
|
@ -308,7 +486,7 @@ void terrain_builder::add_constraint_item(std::vector<std::string> &list, const
|
|||
}
|
||||
}
|
||||
|
||||
void terrain_builder::add_constraints(terrain_builder::constraint_set &constraints, const gamemap::location& loc, const config& cfg)
|
||||
void terrain_builder::add_constraints(terrain_builder::constraint_set &constraints, const gamemap::location& loc, const config& cfg, const config& global_images)
|
||||
{
|
||||
add_constraints(constraints, loc, cfg["type"]);
|
||||
|
||||
|
|
@ -318,7 +496,8 @@ void terrain_builder::add_constraints(terrain_builder::constraint_set &constrain
|
|||
add_constraint_item(constraint.has_flag, cfg, "has_flag");
|
||||
add_constraint_item(constraint.no_flag, cfg, "no_flag");
|
||||
|
||||
add_images_from_config(constraint.images, cfg);
|
||||
add_images_from_config(constraint.images, cfg, false);
|
||||
add_images_from_config(constraint.images, global_images, true);
|
||||
}
|
||||
|
||||
void terrain_builder::parse_mapstring(const std::string &mapstring,
|
||||
|
|
@ -377,18 +556,27 @@ void terrain_builder::parse_mapstring(const std::string &mapstring,
|
|||
}
|
||||
}
|
||||
|
||||
void terrain_builder::add_rotated_rules(building_ruleset& rules, const building_rule& tpl, const std::string &rotations)
|
||||
void terrain_builder::add_rule(building_ruleset& rules, building_rule &rule)
|
||||
{
|
||||
if(rule_valid(rule)) {
|
||||
start_animation(rule);
|
||||
rules.insert(std::pair<int, building_rule>(rule.precedence, rule));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void terrain_builder::add_rotated_rules(building_ruleset& rules, building_rule& tpl, const std::string &rotations)
|
||||
{
|
||||
if(rotations.empty()) {
|
||||
// Adds the parsed built terrain to the list
|
||||
building_rules_.insert(std::pair<int, building_rule>(tpl.precedence, tpl));
|
||||
|
||||
add_rule(rules, tpl);
|
||||
} else {
|
||||
const std::vector<std::string>& rot = config::split(rotations, ',');
|
||||
|
||||
for(int angle = 0; angle < rot.size(); angle++) {
|
||||
building_rules_.insert(std::pair<int, building_rule>(tpl.precedence,
|
||||
rotate_rule(tpl, angle, rot)));
|
||||
building_rule rule = rotate_rule(tpl, angle, rot);
|
||||
add_rule(rules, rule);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -403,7 +591,7 @@ void terrain_builder::parse_config(const config &cfg)
|
|||
for(config::child_list::const_iterator br = brs.begin(); br != brs.end(); ++br) {
|
||||
building_rule pbr; // Parsed Building rule
|
||||
|
||||
add_images_from_config(pbr.images, **br);
|
||||
// add_images_from_config(pbr.images, **br);
|
||||
|
||||
if(!((**br)["x"].empty() || (**br)["y"].empty()))
|
||||
pbr.location_constraints = gamemap::location(atoi((**br)["x"].c_str()), atoi((**br)["y"].c_str()));
|
||||
|
|
@ -430,8 +618,15 @@ void terrain_builder::parse_config(const config &cfg)
|
|||
if((**tc)["y"].size()) {
|
||||
loc.y = atoi((**tc)["y"].c_str());
|
||||
}
|
||||
if(!(**tc)["loc"].empty()) {
|
||||
std::vector<std::string> sloc = config::split((**tc)["pos"]);
|
||||
if(sloc.size() == 2) {
|
||||
loc.x = atoi(sloc[0].c_str());
|
||||
loc.y = atoi(sloc[1].c_str());
|
||||
}
|
||||
}
|
||||
if(loc.valid()) {
|
||||
add_constraints(pbr.constraints, loc, **tc);
|
||||
add_constraints(pbr.constraints, loc, **tc, **br);
|
||||
}
|
||||
if((**tc)["pos"].size()) {
|
||||
int pos = atoi((**tc)["pos"].c_str());
|
||||
|
|
@ -445,7 +640,7 @@ void terrain_builder::parse_config(const config &cfg)
|
|||
|
||||
for(; range.first != range.second; range.first++) {
|
||||
loc = range.first->second;
|
||||
add_constraints(pbr.constraints, loc, **tc);
|
||||
add_constraints(pbr.constraints, loc, **tc, **br);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -502,10 +697,6 @@ void terrain_builder::parse_config(const config &cfg)
|
|||
|
||||
}
|
||||
|
||||
namespace {
|
||||
int matches = 0;
|
||||
}
|
||||
|
||||
bool terrain_builder::terrain_matches(gamemap::TERRAIN letter, const std::string &terrains)
|
||||
{
|
||||
|
||||
|
|
@ -533,12 +724,10 @@ bool terrain_builder::terrain_matches(gamemap::TERRAIN letter, const std::string
|
|||
|
||||
bool terrain_builder::rule_matches(const terrain_builder::building_rule &rule, const gamemap::location &loc, int rule_index, bool check_loc)
|
||||
{
|
||||
matches++;
|
||||
|
||||
if(rule.location_constraints.valid() && rule.location_constraints != loc)
|
||||
return false;
|
||||
|
||||
|
||||
|
||||
|
||||
if(check_loc) {
|
||||
for(constraint_set::const_iterator cons = rule.constraints.begin();
|
||||
cons != rule.constraints.end(); ++cons) {
|
||||
|
|
@ -563,13 +752,13 @@ bool terrain_builder::rule_matches(const terrain_builder::building_rule &rule, c
|
|||
unsigned int random = a*b*c + a*b + b*c + a*c + a + b + c;
|
||||
|
||||
random %= 100;
|
||||
|
||||
|
||||
if(random > rule.probability)
|
||||
return false;
|
||||
}
|
||||
|
||||
for(constraint_set::const_iterator cons = rule.constraints.begin();
|
||||
cons != rule.constraints.end(); ++cons) {
|
||||
cons != rule.constraints.end(); ++cons) {
|
||||
|
||||
const gamemap::location tloc = loc + cons->second.loc;
|
||||
if(!tile_map_.on_map(tloc))
|
||||
|
|
@ -578,13 +767,13 @@ bool terrain_builder::rule_matches(const terrain_builder::building_rule &rule, c
|
|||
|
||||
std::vector<std::string>::const_iterator itor;
|
||||
for(itor = cons->second.no_flag.begin(); itor != cons->second.no_flag.end(); ++itor) {
|
||||
|
||||
|
||||
//If a flag listed in "no_flag" is present, the rule does not match
|
||||
if(btile.flags.find(*itor) != btile.flags.end())
|
||||
return false;
|
||||
}
|
||||
for(itor = cons->second.has_flag.begin(); itor != cons->second.has_flag.end(); ++itor) {
|
||||
|
||||
|
||||
//If a flag listed in "has_flag" is not present, this rule does not match
|
||||
if(btile.flags.find(*itor) == btile.flags.end())
|
||||
return false;
|
||||
|
|
@ -597,45 +786,43 @@ bool terrain_builder::rule_matches(const terrain_builder::building_rule &rule, c
|
|||
void terrain_builder::apply_rule(const terrain_builder::building_rule &rule, const gamemap::location &loc)
|
||||
{
|
||||
for(constraint_set::const_iterator constraint = rule.constraints.begin();
|
||||
constraint != rule.constraints.end(); ++constraint) {
|
||||
constraint != rule.constraints.end(); ++constraint) {
|
||||
|
||||
rule_imagelist::const_iterator img;
|
||||
const gamemap::location tloc = loc + constraint->second.loc;
|
||||
if(!tile_map_.on_map(tloc))
|
||||
return;
|
||||
|
||||
tile& btile = tile_map_[tloc];
|
||||
|
||||
std::multimap<int, std::string>::const_iterator img;
|
||||
|
||||
#if 0
|
||||
for(img = rule.images.begin(); img != rule.images.end(); ++img) {
|
||||
animated<image::locator> th(img->second, locator_string_initializer(constraint->second.loc));
|
||||
#if 0
|
||||
th.start_animation(0,animated<image::locator>::INFINITE_CYCLES);
|
||||
th.update_current_frame();
|
||||
|
||||
|
||||
//image::locator th(img->second, constraint->second.loc);
|
||||
if(img->first < 0) {
|
||||
btile.images_background.push_back(th);
|
||||
} else {
|
||||
btile.images_foreground.push_back(th);
|
||||
}
|
||||
|
||||
#endif
|
||||
btile.images.push_back(std::pair<int, rule_image*>(img->layer, *img));
|
||||
}
|
||||
#endif
|
||||
|
||||
//std::multimap<int, std::string>::const_iterator img;
|
||||
|
||||
for(img = constraint->second.images.begin(); img != constraint->second.images.end(); ++img) {
|
||||
animated<image::locator> th(img->second, locator_string_initializer());
|
||||
th.start_animation(0,animated<image::locator>::INFINITE_CYCLES);
|
||||
th.update_current_frame();
|
||||
//animated<image::locator> th(img->second, locator_string_initializer());
|
||||
|
||||
if(img->first < 0) {
|
||||
btile.images_background.push_back(th);
|
||||
} else {
|
||||
btile.images_foreground.push_back(th);
|
||||
}
|
||||
btile.images.insert(std::pair<int, const rule_image*>(img->layer, &*img));
|
||||
}
|
||||
|
||||
// Sets flags
|
||||
for(std::vector<std::string>::const_iterator itor = constraint->second.set_flag.begin();
|
||||
itor != constraint->second.set_flag.end(); itor++) {
|
||||
itor != constraint->second.set_flag.end(); itor++) {
|
||||
btile.flags.insert(*itor);
|
||||
}
|
||||
|
||||
|
|
@ -712,7 +899,6 @@ int terrain_builder::get_constraint_size(const building_rule& rule, const terrai
|
|||
void terrain_builder::build_terrains()
|
||||
{
|
||||
log_scope("terrain_builder::build_terrains");
|
||||
matches = 0;
|
||||
|
||||
//builds the terrain_by_type_ cache
|
||||
for(int x = -1; x <= map_.x(); ++x) {
|
||||
|
|
@ -746,43 +932,8 @@ void terrain_builder::build_terrains()
|
|||
building_ruleset::const_iterator rule;
|
||||
|
||||
for(rule = building_rules_.begin(); rule != building_rules_.end(); ++rule) {
|
||||
//if the rule has no constraints, it is invalid
|
||||
if(rule->second.constraints.empty())
|
||||
continue;
|
||||
|
||||
//checks if all the images referenced by the current rule are valid.
|
||||
//if not, this rule will not match.
|
||||
bool absent_image = false;
|
||||
rule_imagelist::const_iterator image;
|
||||
constraint_set::const_iterator constraint;
|
||||
|
||||
for(image = rule->second.images.begin();
|
||||
!absent_image && (image != rule->second.images.end()); ++image) {
|
||||
|
||||
std::string s = image->second;
|
||||
s = s.substr(0, s.find_first_of(",:"));
|
||||
|
||||
if(!image::exists("terrain/" + s + ".png"))
|
||||
absent_image = true;
|
||||
}
|
||||
|
||||
for(constraint = rule->second.constraints.begin();
|
||||
constraint != rule->second.constraints.end(); ++constraint) {
|
||||
for(image = constraint->second.images.begin();
|
||||
!absent_image && (image != constraint->second.images.end());
|
||||
++image) {
|
||||
|
||||
std::string s = image->second;
|
||||
s = s.substr(0, s.find_first_of(",:"));
|
||||
|
||||
if(!image::exists("terrain/" + s + ".png"))
|
||||
absent_image = true;
|
||||
}
|
||||
}
|
||||
|
||||
if(absent_image)
|
||||
continue;
|
||||
|
||||
//find the constraint that contains the less terrain of all terrain rules.
|
||||
constraint_set::const_iterator smallest_constraint;
|
||||
constraint_set::const_iterator constraint_most_adjacents;
|
||||
|
|
@ -876,6 +1027,4 @@ void terrain_builder::build_terrains()
|
|||
|
||||
rule_index++;
|
||||
}
|
||||
|
||||
std::cerr << "Matches = " << matches << "\n";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public:
|
|||
//built content for this tile.
|
||||
//Returns NULL if there is no built content for this tile.
|
||||
const imagelist *get_terrain_at(const gamemap::location &loc,
|
||||
ADJACENT_TERRAIN_TYPE terrain_type) const;
|
||||
const std::string &tod, ADJACENT_TERRAIN_TYPE terrain_type) const;
|
||||
|
||||
//updates the animation at a given tile. returns true if something has
|
||||
//changed, and must be redrawn.
|
||||
|
|
@ -48,7 +48,28 @@ public:
|
|||
void rebuild_all();
|
||||
|
||||
|
||||
typedef std::multimap<int, std::string> rule_imagelist;
|
||||
// typedef std::multimap<int, std::string> rule_imagelist;
|
||||
struct rule_image_variant {
|
||||
rule_image_variant(const std::string &image_string, const std::string &tod) :
|
||||
image_string(image_string), tod(tod) {};
|
||||
|
||||
std::string image_string;
|
||||
|
||||
animated<image::locator> image;
|
||||
std::string tod;
|
||||
};
|
||||
|
||||
typedef std::map<std::string, rule_image_variant> rule_image_variantlist;
|
||||
struct rule_image {
|
||||
rule_image(int layer, bool global_image=false) :
|
||||
layer(layer), global_image(global_image) {};
|
||||
|
||||
int layer;
|
||||
bool global_image;
|
||||
rule_image_variantlist variants;
|
||||
};
|
||||
|
||||
typedef std::vector<rule_image> rule_imagelist;
|
||||
|
||||
struct terrain_constraint
|
||||
{
|
||||
|
|
@ -68,13 +89,20 @@ public:
|
|||
struct tile
|
||||
{
|
||||
tile();
|
||||
void rebuild_cache(const std::string &tod) const;
|
||||
void clear();
|
||||
|
||||
std::set<std::string> flags;
|
||||
imagelist images_foreground;
|
||||
imagelist images_background;
|
||||
|
||||
std::multimap<int, const rule_image*> images;
|
||||
|
||||
mutable imagelist images_foreground; //this is a mutable cache
|
||||
mutable imagelist images_background; //this is a mutable cache
|
||||
|
||||
mutable std::string last_tod;
|
||||
|
||||
gamemap::TERRAIN adjacents[7];
|
||||
|
||||
void clear();
|
||||
};
|
||||
|
||||
private:
|
||||
|
|
@ -88,11 +116,12 @@ private:
|
|||
int probability;
|
||||
int precedence;
|
||||
|
||||
rule_imagelist images;
|
||||
// rule_imagelist images;
|
||||
};
|
||||
|
||||
struct tilemap
|
||||
class tilemap
|
||||
{
|
||||
public:
|
||||
tilemap(int x, int y) : x_(x), y_(y), map_((x+2)*(y+2)) {}
|
||||
|
||||
tile &operator[](const gamemap::location &loc);
|
||||
|
|
@ -101,7 +130,7 @@ private:
|
|||
bool on_map(const gamemap::location &loc) const;
|
||||
|
||||
void reset();
|
||||
|
||||
private:
|
||||
std::vector<tile> map_;
|
||||
int x_;
|
||||
int y_;
|
||||
|
|
@ -109,21 +138,28 @@ private:
|
|||
|
||||
typedef std::multimap<int, building_rule> building_ruleset;
|
||||
|
||||
|
||||
bool rule_valid(const building_rule &rule);
|
||||
bool start_animation(building_rule &rule);
|
||||
terrain_constraint rotate(const terrain_constraint &constraint, int angle);
|
||||
void replace_token(std::string &, const std::string &token, const std::string& replacement);
|
||||
void replace_token(rule_image_variant &, const std::string &token, const std::string& replacement);
|
||||
void replace_token(rule_image &, const std::string &token, const std::string& replacement);
|
||||
void replace_token(rule_imagelist &, const std::string &token, const std::string& replacement);
|
||||
void replace_token(building_rule &s, const std::string &token, const std::string& replacement);
|
||||
|
||||
building_rule rotate_rule(const building_rule &rule, int angle, const std::vector<std::string>& angle_name);
|
||||
void add_rotated_rules(building_ruleset& rules, const building_rule& tpl, const std::string &rotations);
|
||||
|
||||
void add_rule(building_ruleset& rules, building_rule &rule);
|
||||
void add_rotated_rules(building_ruleset& rules, building_rule& tpl, const std::string &rotations);
|
||||
void add_constraint_item(std::vector<std::string> &list, const config& cfg, const std::string &item);
|
||||
|
||||
void terrain_builder::add_images_from_config(rule_imagelist &images, const config &cfg);
|
||||
void add_images_from_config(rule_imagelist &images, const config &cfg, bool global);
|
||||
|
||||
void add_constraints(std::map<gamemap::location, terrain_constraint>& constraints,
|
||||
const gamemap::location &loc, const std::string& type);
|
||||
void add_constraints(std::map<gamemap::location, terrain_constraint>& constraints, const gamemap::location &loc,
|
||||
const config &cfg);
|
||||
void add_constraints(std::map<gamemap::location, terrain_constraint>& constraints,
|
||||
const gamemap::location &loc, const config &cfg, const config& global_images);
|
||||
|
||||
typedef std::multimap<int, gamemap::location> anchormap;
|
||||
void parse_mapstring(const std::string &mapstring, struct building_rule &br,
|
||||
|
|
|
|||
|
|
@ -531,6 +531,8 @@ void draw_label(display& disp, surface target, const theme::label& label)
|
|||
|
||||
void display::draw(bool update,bool force)
|
||||
{
|
||||
bool changed = false;
|
||||
|
||||
//log_scope("Drawing");
|
||||
invalidate_animations();
|
||||
|
||||
|
|
@ -551,6 +553,8 @@ void display::draw(bool update,bool force)
|
|||
std::fill(reports_,reports_+sizeof(reports_)/sizeof(*reports_),reports::report());
|
||||
invalidateGameStatus_ = true;
|
||||
panelsDrawn_ = true;
|
||||
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if(invalidateAll_ && !map_.empty()) {
|
||||
|
|
@ -563,7 +567,11 @@ void display::draw(bool update,bool force)
|
|||
invalidateAll_ = false;
|
||||
|
||||
redrawMinimap_ = true;
|
||||
changed = true;
|
||||
} else if(!map_.empty()) {
|
||||
if(!invalidated_.empty())
|
||||
changed = true;
|
||||
|
||||
for(std::set<gamemap::location>::const_iterator it =
|
||||
invalidated_.begin(); it != invalidated_.end(); ++it) {
|
||||
draw_tile(it->x,it->y);
|
||||
|
|
@ -576,11 +584,13 @@ void display::draw(bool update,bool force)
|
|||
redrawMinimap_ = false;
|
||||
const SDL_Rect area = minimap_area();
|
||||
draw_minimap(area.x,area.y,area.w,area.h);
|
||||
changed = true;
|
||||
}
|
||||
|
||||
|
||||
if(!map_.empty()) {
|
||||
draw_sidebar();
|
||||
changed = true;
|
||||
}
|
||||
|
||||
prune_chat_messages();
|
||||
|
|
@ -597,10 +607,12 @@ void display::draw(bool update,bool force)
|
|||
if(update) {
|
||||
lastDraw_ = SDL_GetTicks();
|
||||
|
||||
if(wait_time >= 0 || drawSkips_ >= max_skips || force)
|
||||
update_display();
|
||||
else
|
||||
if(wait_time >= 0 || drawSkips_ >= max_skips || force) {
|
||||
if(changed)
|
||||
update_display();
|
||||
} else {
|
||||
drawSkips_++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1612,10 +1624,14 @@ std::vector<surface> display::get_terrain_images(int x, int y, image::TYPE image
|
|||
std::vector<surface> res;
|
||||
gamemap::location loc(x,y);
|
||||
|
||||
const time_of_day& tod = status_.get_time_of_day();
|
||||
// const time_of_day& tod_at = timeofday_at(status_,units_,gamemap::location(x,y));
|
||||
|
||||
terrain_builder::ADJACENT_TERRAIN_TYPE builder_terrain_type =
|
||||
(terrain_type == ADJACENT_FOREGROUND ?
|
||||
terrain_builder::ADJACENT_FOREGROUND : terrain_builder::ADJACENT_BACKGROUND);
|
||||
const std::vector<animated<image::locator> >* const terrains = builder_.get_terrain_at(loc,builder_terrain_type);
|
||||
const terrain_builder::imagelist* const terrains = builder_.get_terrain_at(loc,
|
||||
tod.id, builder_terrain_type);
|
||||
|
||||
if(terrains != NULL) {
|
||||
for(std::vector<animated<image::locator> >::const_iterator it = terrains->begin(); it != terrains->end(); ++it) {
|
||||
|
|
@ -1623,7 +1639,7 @@ std::vector<surface> display::get_terrain_images(int x, int y, image::TYPE image
|
|||
image::locator image = it->get_current_frame();
|
||||
// image.filename = "terrain/" + image.filename;
|
||||
|
||||
const surface surface(get_terrain(image,image_type,x,y,true));
|
||||
const surface surface(get_terrain(image,image_type,x,y));
|
||||
if(surface != NULL) {
|
||||
res.push_back(surface);
|
||||
}
|
||||
|
|
@ -1638,7 +1654,7 @@ std::vector<surface> display::get_terrain_images(int x, int y, image::TYPE image
|
|||
image::locator image(*it);
|
||||
// image.filename = "terrain/" + *it;
|
||||
|
||||
const surface surface(get_terrain(image,image_type,x,y,true));
|
||||
const surface surface(get_terrain(image,image_type,x,y));
|
||||
if(surface != NULL) {
|
||||
res.push_back(surface);
|
||||
}
|
||||
|
|
@ -1651,13 +1667,10 @@ std::vector<surface> display::get_terrain_images(int x, int y, image::TYPE image
|
|||
}
|
||||
|
||||
surface display::get_terrain(const image::locator& image, image::TYPE image_type,
|
||||
int x, int y, bool search_tod)
|
||||
int x, int y)
|
||||
{
|
||||
surface im(NULL);
|
||||
|
||||
const time_of_day& tod = status_.get_time_of_day();
|
||||
const time_of_day& tod_at = timeofday_at(status_,units_,gamemap::location(x,y));
|
||||
|
||||
#if 0
|
||||
//see if there is a time-of-day specific version of this image
|
||||
if(search_tod) {
|
||||
// image::locator tod_image = image;
|
||||
|
|
@ -1669,15 +1682,17 @@ surface display::get_terrain(const image::locator& image, image::TYPE image_type
|
|||
return im;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// image::locator tmp = image;
|
||||
// tmp.filename += ".png";
|
||||
|
||||
im = image::get_image(image, image_type);
|
||||
const surface im(image::get_image(image, image_type));
|
||||
if(im == NULL) {
|
||||
return im;
|
||||
}
|
||||
|
||||
#if 0
|
||||
//see if this tile is illuminated to a different colour than it'd
|
||||
//normally be displayed as
|
||||
const int radj = tod_at.red - tod.red;
|
||||
|
|
@ -1690,6 +1705,7 @@ surface display::get_terrain(const image::locator& image, image::TYPE image_type
|
|||
if(im == NULL)
|
||||
std::cerr << "could not adjust surface..\n";
|
||||
}
|
||||
#endif
|
||||
|
||||
return im;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@ private:
|
|||
// int x, int y, const std::string& dir="");
|
||||
//this surface must be freed by the caller
|
||||
surface get_terrain(const image::locator &image, image::TYPE type,
|
||||
int x, int y, bool search_tod);
|
||||
int x, int y);
|
||||
|
||||
//this surface must be freed by the caller
|
||||
surface get_flag(gamemap::TERRAIN, int x, int y);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue