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

Fix showing a fixed graphic for invisible monsters in Scry Monster

Browse Source 
Also fix dialogs never showing a frame around blank graphics
This commit is contained in:
Celtic Minstrel
2017-01-22 11:10:40 -05:00
parent 8e43ce4347
commit 15637c763b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dialogxml/pict.cpp
View File

@@ -720,12 +720,11 @@ void cPict::draw(){
inWindow->setActive(); inWindow->setActive();
if(!visible) return; if(!visible) return;
if(picNum == BLANK) { // Just fill with black
fill_rect(*inWindow, rect, sf::Color::Black);
return;
}
(this->*drawPict()[picType])(picNum,rect); if(picNum == BLANK) // Just fill with black
fill_rect(*inWindow, rect, sf::Color::Black);
else (this->*drawPict()[picType])(picNum,rect);
if(drawFramed) drawFrame(2,frameStyle); if(drawFramed) drawFrame(2,frameStyle);
} }

2
src/tools/view_dialogs.cpp
View File

@@ -121,7 +121,7 @@ void put_monst_info(cDialog& me, const cMonster& store_m, const cScenario& scen)
cPict& pic = dynamic_cast<cPict&>(me["pic"]); cPict& pic = dynamic_cast<cPict&>(me["pic"]);
if(store_m.invisible) if(store_m.invisible)
pic.setPict(400,PIC_MONST);// TODO: should probably be PICT_BLANK? pic.setPict(-1,PIC_MONST);
else if(store_m.picture_num < 1000) else if(store_m.picture_num < 1000)
pic.setPict(store_m.picture_num,PIC_MONST); pic.setPict(store_m.picture_num,PIC_MONST);
else { else {