Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use swap buttons in hero meeting dialog #3106

Merged
merged 9 commits into from
Apr 18, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into meeting_hero_swap_buttons
  • Loading branch information
ihhub authored Apr 17, 2021
commit df48ee923e53ed02545b83eb0d4a7774e03ab7b4
16 changes: 15 additions & 1 deletion src/fheroes2/agg/agg_image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,21 @@ namespace fheroes2

return true;
}
case ICN::WHITE_LARGE_FONT: {
LoadModifiedICN( ICN::FONT );
const std::vector<Sprite> & original = _icnVsSprite[ICN::FONT];
_icnVsSprite[id].resize( original.size() );
for ( size_t i = 0; i < _icnVsSprite[id].size(); ++i ) {
const Sprite & in = original[i];
Sprite & out = _icnVsSprite[id][i];
out.resize( in.width() * 2, in.height() * 2 );
Resize( in, out, true );
out.setPosition( in.x() * 2, in.y() * 2 );
}

return true;
}

case ICN::SWAP_ARROW: {
const Sprite & original = GetICN( ICN::SWAPWIN, 0 );
std::vector<Image> input( 4 );
Expand All @@ -709,7 +724,6 @@ namespace fheroes2
ApplyPalette( output, 4 );

return true;
}
default:
break;
}
Expand Down
1 change: 1 addition & 0 deletions src/fheroes2/agg/icn.h
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,7 @@ namespace ICN
UNIFORM_EVIL_MAX_BUTTON,
UNIFORM_EVIL_MIN_BUTTON,

WHITE_LARGE_FONT,
SWAP_ARROW,

// IMPORTANT! Put any new entry just above this one.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.