0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply patch patch #2664, Fix for bug #17933

Browse source
This commit is contained in:
Jérémy Rosen 2011-08-01 11:27:54 +00:00
parent 4cfa45d16f
commit ad5f949a59
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/image.cpp
View file

@ -472,22 +472,6 @@ surface locator::load_image_sub_file() const
if(surf == NULL)
return NULL;
if(val_.loc_.valid()) {
SDL_Rect srcrect = create_rect(
((tile_size*3) / 4) * val_.loc_.x
, tile_size * val_.loc_.y + (tile_size / 2) * (val_.loc_.x % 2)
, tile_size
, tile_size);
if(val_.center_x_ >= 0 && val_.center_y_>= 0){
srcrect.x += surf->w/2 - val_.center_x_;
srcrect.y += surf->h/2 - val_.center_y_;
}
surface cut(cut_surface(surf, srcrect));
surf = mask_surface(cut, get_hexmask());
}
modification_queue mods = modification::decode(val_.modifications_);
while(!mods.empty()) {
@ -497,6 +481,22 @@ surface locator::load_image_sub_file() const
surf = (*mod)(surf);
delete mod;
}
if(val_.loc_.valid()) {
SDL_Rect srcrect = create_rect(
((tile_size*3) / 4) * val_.loc_.x
, tile_size * val_.loc_.y + (tile_size / 2) * (val_.loc_.x % 2)
, tile_size
, tile_size);
if(val_.center_x_ >= 0 && val_.center_y_>= 0){
srcrect.x += surf->w/2 - val_.center_x_;
srcrect.y += surf->h/2 - val_.center_y_;
}
surface cut(cut_surface(surf, srcrect));
surf = mask_surface(cut, get_hexmask());
}
return surf;
}