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

cPict: begin to differentiate the picture type and the dialog type

Browse Source 
+ begin to merge the drawing functions, to be continued
all: try to use the pict.cpp functions to draw items..
This commit is contained in:
ALONSO Laurent
2021-10-20 10:19:00 +02:00
committed by Celtic Minstrel
parent 3451c70fec
commit a7a24e7e7a
12 changed files with 206 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/scenedit/scen.townout.cpp
View File

@@ -247,7 +247,7 @@ static bool put_placed_item_in_dlog(cDialog& me, const cTown::cItem& item, const
if(item.contained)
dynamic_cast<cLed&>(me["contained"]).setState(led_red);
dynamic_cast<cPict&>(me["pic"]).setPict(base.graphic_num, PIC_ITEM);
dynamic_cast<cPict&>(me["pic"]).setPict(base.get_picture_num(false));
me["charges"].show();
me["charges-lbl"].show();
@@ -368,10 +368,7 @@ void edit_sign(sign_loc_t& which_sign,short num,short picture) {
cDialog sign_dlg("edit-sign");
sign_dlg["cancel"].attachClickHandler(std::bind(&cDialog::toast, &sign_dlg, false));
sign_dlg["okay"].attachClickHandler(std::bind(edit_sign_event_filter, _1, std::ref(which_sign)));
if (check_picture_num(cTerrain::get_picture_num_for_terrain(picture), false)) // REMOVEME
dynamic_cast<cPict&>(sign_dlg["pic"]).setPict(cTerrain::get_picture_num_for_terrain(picture)); // checkme: does this really need to be some terrain?
else
dynamic_cast<cPict&>(sign_dlg["pic"]).setPict(cPictNum(1999,ePicType::PIC_CUSTOM_TER));
dynamic_cast<cPict&>(sign_dlg["pic"]).setPict(cTerrain::get_picture_num_for_terrain(picture)); // checkme: does this really need to be some terrain?
sign_dlg["num"].setTextToNum(num);