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

boe.infodlg.cpp: try to correct a problem when displaying notes,

Browse Source 
gfxsheets.cpp: try to make the scenario's graphic resolution independent...
This commit is contained in:
Laurent alonso
2020-10-27 18:56:58 +01:00
committed by Celtic Minstrel
parent 1daca1cf55
commit 303674da10
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/boe.infodlg.cpp
View File

@@ -478,17 +478,8 @@ static bool adventure_notes_event_filter(cDialog& me, std::string item_hit, eKey
}
for(short i = 0; i < 3; i++) {
std::string n = boost::lexical_cast<std::string>(i + 1);
if(univ.party.special_notes.size() > i) {
me["str" + n].setText(univ.party.special_notes[i].the_str);
me["del" + n].show();
}
else me["del" + n].hide();
}
// TODO: What's this second loop for?
for(short i = store_page_on * 3; i < (store_page_on * 3) + 3; i++) {
std::string n = boost::lexical_cast<std::string>(i + 1);
if(univ.party.special_notes.size() > i) {
me["str" + n].setText(univ.party.special_notes[i].the_str);
if(univ.party.special_notes.size() > store_page_on * 3+i) {
me["str" + n].setText(univ.party.special_notes[store_page_on * 3+i].the_str);
me["del" + n].show();
}
else {

15
src/gfx/gfxsheets.cpp
View File

@@ -63,12 +63,18 @@ size_t cCustomGraphics::count(bool party) {
void cCustomGraphics::copy_graphic(pic_num_t dest, pic_num_t src, size_t numSlots) {
if(numSlots < 1) return;
if(!party_sheet) {
// retrieve the first sheet, do determine a valid scaling
Texture sheet0;
std::tie(sheet0,std::ignore) = find_graphic(dest,true);
float scale[2]={float(sheet0->getSize().x)/sheet0.dimension.x, float(sheet0->getSize().y)/sheet0.dimension.y};
sf::Image empty;
empty.create(280, 180, sf::Color::Transparent);
empty.create(int(280*scale[0]), int(180*scale[1]), sf::Color::Transparent);
sf::Texture sheet;
sheet.create(280, 180);
sheet.create(int(280*scale[0]), int(180*scale[1]));
sheet.update(empty);
party_sheet=Texture(sheet);
party_sheet.dimension={280,180};
numSheets = 1;
}
size_t havePics = count();
@@ -76,11 +82,14 @@ void cCustomGraphics::copy_graphic(pic_num_t dest, pic_num_t src, size_t numSlot
int addRows = 1;
while(havePics + 10 * addRows < dest + numSlots)
addRows++;
float scale[2]={float(party_sheet->getSize().x)/party_sheet.dimension.x, float(party_sheet->getSize().y)/party_sheet.dimension.y};
sf::RenderTexture temp;
temp.create(280, party_sheet->getSize().y + 36 * addRows);
temp.create(int(280*scale[0]), party_sheet->getSize().y+int(36 * addRows*scale[1]));
temp.clear(sf::Color::Transparent);
rect_draw_some_item(party_sheet, rectangle(party_sheet), temp, rectangle(*party_sheet));
unsigned oldY=party_sheet.dimension.y;
party_sheet=Texture(temp.getTexture());
party_sheet.dimension={280,oldY + 36 * addRows};
}
Texture from_sheet;
Texture to_sheet;