openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Make use of the new resource manager's purgeable flag

Browse Source
This commit is contained in:
Celtic Minstrel
2020-01-26 16:14:39 -05:00
parent a2e73a0223
commit d530abe00b
6 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/boe.graphics.cpp
View File

@@ -165,7 +165,7 @@ void adjust_window_mode() {
mainView.setViewport(mainPort);
#ifndef __APPLE__ // This overrides Dock icon on OSX, which isn't what we want at all
const ImageRsrc& icon = ResMgr::graphics.get("icon");
const ImageRsrc& icon = ResMgr::graphics.get("icon", true);
mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr());
#endif
if(text_sbar) {
@@ -245,13 +245,13 @@ sf::FloatRect compute_viewport(const sf::RenderWindow& mainPtr, int mode, float
void init_startup() {
// Preload the main startup images
ResMgr::graphics.get("startup");
ResMgr::graphics.get("startbut");
ResMgr::graphics.get("startanim");
ResMgr::graphics.get("startup", true);
ResMgr::graphics.get("startbut", true);
ResMgr::graphics.get("startanim", true);
}
void draw_startup(short but_type) {
sf::Texture& startup_gworld = *ResMgr::graphics.get("startup");
sf::Texture& startup_gworld = *ResMgr::graphics.get("startup", true);
rect_draw_some_item(startup_gworld,startup_from[0],mainPtr,startup_top);
for(auto btn : startup_button.keys()) {
@@ -271,9 +271,9 @@ void draw_startup_anim(bool advance) {
anim_from = anim_to;
anim_from.offset(-1,-4 + startup_anim_pos);
if(advance) startup_anim_pos = (startup_anim_pos + 1) % 542;
rect_draw_some_item(*ResMgr::graphics.get("startbut"),anim_size,mainPtr,startup_button[STARTBTN_SCROLL]);
rect_draw_some_item(*ResMgr::graphics.get("startbut",true),anim_size,mainPtr,startup_button[STARTBTN_SCROLL]);
anim_to.offset(startup_button[STARTBTN_SCROLL].left, startup_button[STARTBTN_SCROLL].top);
rect_draw_some_item(*ResMgr::graphics.get("startanim"),anim_from,mainPtr,anim_to,sf::BlendAlpha);
rect_draw_some_item(*ResMgr::graphics.get("startanim",true),anim_from,mainPtr,anim_to,sf::BlendAlpha);
}
void draw_startup_stats() {
@@ -429,7 +429,7 @@ void draw_start_button(eStartButton which_position,short which_button) {
to_rect.left += 4; to_rect.top += 4;
to_rect.right = to_rect.left + 40;
to_rect.bottom = to_rect.top + 40;
rect_draw_some_item(*ResMgr::graphics.get("startup"),from_rect,mainPtr,to_rect);
rect_draw_some_item(*ResMgr::graphics.get("startup",true),from_rect,mainPtr,to_rect);
TextStyle style;
style.font = FONT_DUNGEON;

4
src/game/boe.startup.cpp
View File

@@ -143,7 +143,7 @@ void show_logo() {
whole_window = rectangle(mainPtr);
logo_from.offset((whole_window.right - logo_from.right) / 2,(whole_window.bottom - logo_from.bottom) / 2);
sf::Texture& pict_to_draw = *ResMgr::graphics.get("spidlogo");
sf::Texture& pict_to_draw = *ResMgr::graphics.get("spidlogo", true);
from_rect = rectangle(pict_to_draw);
play_sound(-95);
@@ -165,7 +165,7 @@ void plop_fancy_startup() {
whole_window = rectangle(mainPtr);
sf::Time delay = time_in_ticks(220);
intro_from.offset((whole_window.right - intro_from.right) / 2,(whole_window.bottom - intro_from.bottom) / 2);
sf::Texture& pict_to_draw = *ResMgr::graphics.get("startsplash");
sf::Texture& pict_to_draw = *ResMgr::graphics.get("startsplash", true);
play_sound(-22);
sf::Clock timer;