mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-17 01:32:21 +02:00
* right click popups in towns
* drawing window text-bitmap-subtitle * destructor for CDefEssential * version changed to 0.5x (or maybe it should be 0.6 ?) * minor changes
This commit is contained in:
@ -378,6 +378,25 @@ CInfoWindow::~CInfoWindow()
|
||||
{
|
||||
}
|
||||
|
||||
void CRClickPopup::clickRight (tribool down)
|
||||
{
|
||||
if(down)
|
||||
return;
|
||||
close();
|
||||
}
|
||||
|
||||
void CRClickPopup::activate()
|
||||
{
|
||||
ClickableR::activate();
|
||||
LOCPLINT->objsToBlit.push_back(this);
|
||||
}
|
||||
|
||||
void CRClickPopup::deactivate()
|
||||
{
|
||||
ClickableR::deactivate();
|
||||
LOCPLINT->objsToBlit.erase(std::find(LOCPLINT->objsToBlit.begin(),LOCPLINT->objsToBlit.end(),this));
|
||||
}
|
||||
|
||||
CInfoPopup::CInfoPopup(SDL_Surface * Bitmap, int x, int y, bool Free)
|
||||
:bitmap(Bitmap),free(Free)
|
||||
{
|
||||
@ -386,21 +405,6 @@ CInfoPopup::CInfoPopup(SDL_Surface * Bitmap, int x, int y, bool Free)
|
||||
pos.h = bitmap->h;
|
||||
pos.w = bitmap->w;
|
||||
}
|
||||
void CInfoPopup::clickRight (tribool down)
|
||||
{
|
||||
//if(!down)
|
||||
close();
|
||||
}
|
||||
void CInfoPopup::activate()
|
||||
{
|
||||
ClickableR::activate();
|
||||
LOCPLINT->objsToBlit.push_back(this);
|
||||
}
|
||||
void CInfoPopup::deactivate()
|
||||
{
|
||||
ClickableR::deactivate();
|
||||
LOCPLINT->objsToBlit.erase(std::find(LOCPLINT->objsToBlit.begin(),LOCPLINT->objsToBlit.end(),this));
|
||||
}
|
||||
void CInfoPopup::close()
|
||||
{
|
||||
deactivate();
|
||||
|
Reference in New Issue
Block a user