- Nuked the storage_gworld and party_template_gworld. Monster, terrain, and PC graphics are now drawn directly from their sheets of origin. This is partly tested, and seems to work fine.
- Removed the terrain_pic and terrain_blockage arrays, which were redundant (though shorter). - Cleaned out some of the commented code in boe.graphics.cpp and boe.graphutil.cpp - Added a templated get function to cOutdoors::cWandering. In the dialog engine: - Important fields are now initialized to default values, as they should be. - The absence of required attributes is now recognized as an error - Added stack element to the DTD; no code support yet - Added fore attribute to the dialog element to specify default text colour; DTD updated and code support added. - Likewise with the def-key attribute on other clickable items besides buttons (which already had it) - Updated stylesheet to fall back on the fore attribute when colour is unspecified - When drawing default monster graphics, it uses m_start_pic instead of num as the index. This should be right, though it's untested. Unfortunately, the dialog engine is still unstable. git-svn-id: http://openexile.googlecode.com/svn/trunk@100 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
@@ -31,9 +31,15 @@ bool cButton::triggerClickHandler(cDialog& me, std::string id, eKeyMod mods, Poi
|
||||
return false;
|
||||
}
|
||||
|
||||
cButton::cButton(cDialog* parent) : cControl(parent,CTRL_BTN) {}
|
||||
cButton::cButton(cDialog* parent) :
|
||||
cControl(parent,CTRL_BTN),
|
||||
wrapLabel(false),
|
||||
fromList("none") {}
|
||||
|
||||
cButton::cButton(cDialog* parent,eControlType t) : cControl(parent,t) {}
|
||||
cButton::cButton(cDialog* parent,eControlType t) :
|
||||
cControl(parent,t),
|
||||
fromList("none"),
|
||||
wrapLabel("true") {/* This constructor is only called for LEDs. TODO: Should wrapLabel be true for LEDs? */}
|
||||
|
||||
bool cButton::isClickable(){
|
||||
return true;
|
||||
@@ -163,7 +169,12 @@ void cLed::init(){
|
||||
}
|
||||
}
|
||||
|
||||
cLed::cLed(cDialog* parent) : cButton(parent,CTRL_LED) {}
|
||||
cLed::cLed(cDialog* parent) :
|
||||
cButton(parent,CTRL_LED),
|
||||
state(led_off),
|
||||
textFont(SILOM),
|
||||
textSize(10),
|
||||
color(parent->defTextClr) {}
|
||||
|
||||
void cLed::attachClickHandler(click_callback_t f) throw(){
|
||||
onClick = f;
|
||||
@@ -237,7 +248,9 @@ void cLed::draw(){
|
||||
SetPort(old_port);
|
||||
}
|
||||
|
||||
cLedGroup::cLedGroup(cDialog* parent) : cControl(parent,CTRL_GROUP) {}
|
||||
cLedGroup::cLedGroup(cDialog* parent) :
|
||||
cControl(parent,CTRL_GROUP),
|
||||
fromList("none") {}
|
||||
|
||||
cButton::~cButton() {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user