Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up : Use more reference instead of pointer.

Browse source
This commit is contained in:
joris 2012-08-09 13:46:12 +02:00
parent fd343d67d5
commit 2d7453c46c
7 changed files with 149 additions and 160 deletions

16
cmake/modules/FindOggVorbis.cmake
View file

@ -21,16 +21,18 @@ include (CheckLibraryExists)
find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
find_path(OGG_INCLUDE_DIR ogg/ogg.h)
find_library(OGG_LIBRARY NAMES ogg)
find_library(VORBIS_LIBRARY NAMES vorbis)
find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
find_library(OGG_LIBRARY NAMES ogg ogg_static)
find_library(VORBIS_LIBRARY NAMES vorbis vorbis_static)
find_library(VORBISFILE_LIBRARY NAMES vorbisfile vorbisfile_static)
find_library(VORBISENC_LIBRARY NAMES vorbisenc)
mark_as_advanced(VORBIS_INCLUDE_DIR OGG_INCLUDE_DIR
OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY VORBISENC_LIBRARY)
if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
#if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)
set(OGGVORBIS_FOUND TRUE)
set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
@ -46,10 +48,12 @@ if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_L
set (OGGVORBIS_VERSION 1)
endif (HAVE_LIBVORBISENC2)
else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
#else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)
set (OGGVORBIS_VERSION)
set(OGGVORBIS_FOUND FALSE)
endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
#endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)
if (OGGVORBIS_FOUND)

6
cmake/modules/FindTheora.cmake
View file

@ -13,11 +13,11 @@ endif(THEORA_INCLUDE_DIR AND THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AN
FIND_PATH(THEORA_INCLUDE_DIR theora/theora.h)
FIND_LIBRARY(THEORA_OGG_LIBRARIES NAMES ogg )
FIND_LIBRARY(THEORA_OGG_LIBRARIES NAMES ogg)
FIND_LIBRARY(THEORA_VORBIS_LIBRARIES NAMES vorbis)
FIND_LIBRARY(THEORA_VORBIS_LIBRARIES NAMES vorbis vorbis_static)
FIND_LIBRARY(THEORA_LIB_LIBRARIES NAMES theora)
FIND_LIBRARY(THEORA_LIB_LIBRARIES NAMES theora theora_static)
if(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES AND THEORA_INCLUDE_DIR)
set(THEORA_LIBRARY ${THEORA_LIB_LIBRARIES} ${THEORA_OGG_LIBRARIES} ${THEORA_VORBIS_LIBRARIES})

30
src/include/interface.h
View file

@ -79,7 +79,7 @@ enum ButtonCmd {
};
class ButtonAction;
typedef bool (*ButtonCheckFunc)(const CUnit &, const ButtonAction *);
typedef bool (*ButtonCheckFunc)(const CUnit &, const ButtonAction &);
/// Action of button
class ButtonAction
@ -365,7 +365,7 @@ extern void DrawTimer();
/// Update the timer
extern void UpdateTimer();
/// Update the status line with hints from the button
extern void UpdateStatusLineForButton(const ButtonAction *button);
extern void UpdateStatusLineForButton(const ButtonAction &button);
/// Draw the Pie Menu
extern void DrawPieMenu();
@ -376,31 +376,31 @@ extern bool HandleMouseScrollArea(const PixelPos &mousePos);
// in button_checks.cpp
//
/// Check is always true
extern bool ButtonCheckTrue(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckTrue(const CUnit &unit, const ButtonAction &button);
/// Check is always false
extern bool ButtonCheckFalse(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckFalse(const CUnit &unit, const ButtonAction &button);
/// Check if allowed upgrade is ready
extern bool ButtonCheckUpgrade(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckUpgrade(const CUnit &unit, const ButtonAction &button);
/// Check if allowed units exists
extern bool ButtonCheckUnitsOr(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckUnitsOr(const CUnit &unit, const ButtonAction &button);
/// Check if allowed units exists
extern bool ButtonCheckUnitsAnd(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckUnitsAnd(const CUnit &unit, const ButtonAction &button);
/// Check if have network play
extern bool ButtonCheckNetwork(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckNetwork(const CUnit &unit, const ButtonAction &button);
/// Check if don't have network play
extern bool ButtonCheckNoNetwork(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckNoNetwork(const CUnit &unit, const ButtonAction &button);
/// Check if unit isn't working (train,upgrade,research)
extern bool ButtonCheckNoWork(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckNoWork(const CUnit &unit, const ButtonAction &button);
/// Check if unit isn't researching or upgrading
extern bool ButtonCheckNoResearch(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckNoResearch(const CUnit &unit, const ButtonAction &button);
/// Check if all requirements for an attack to are meet
extern bool ButtonCheckAttack(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckAttack(const CUnit &unit, const ButtonAction &button);
/// Check if all requirements for an upgrade to are meet
extern bool ButtonCheckUpgradeTo(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckUpgradeTo(const CUnit &unit, const ButtonAction &button);
/// Check if all requirements for a research are meet
extern bool ButtonCheckResearch(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckResearch(const CUnit &unit, const ButtonAction &button);
/// Check if all requirements for a single research are meet
extern bool ButtonCheckSingleResearch(const CUnit &unit, const ButtonAction *button);
extern bool ButtonCheckSingleResearch(const CUnit &unit, const ButtonAction &button);
//
// in ccl_ui.c

30
src/include/ui.h
View file

@ -476,11 +476,11 @@ public:
virtual ~CPopupContentType() { delete Condition; }
/// Tell how show the variable Index.
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *Costs) const = 0;
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const = 0;
/// Get the content's width
virtual int GetWidth(const ButtonAction *button, int *Costs) const = 0;
virtual int GetWidth(const ButtonAction &button, int *Costs) const = 0;
/// Get the content's height
virtual int GetHeight(const ButtonAction *button, int *Costs) const = 0;
virtual int GetHeight(const ButtonAction &button, int *Costs) const = 0;
int PosX; /// X position to draw.
int PosY; /// X position to draw.
@ -504,10 +504,10 @@ public:
CPopupContentTypeButtonInfo() : InfoType(0), MaxWidth(0), Font(NULL), Centered(0) {}
virtual ~CPopupContentTypeButtonInfo() {}
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *Costs) const;
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
virtual int GetWidth(const ButtonAction *button, int *Costs) const;
virtual int GetHeight(const ButtonAction *button, int *Costs) const;
virtual int GetWidth(const ButtonAction &button, int *Costs) const;
virtual int GetHeight(const ButtonAction &button, int *Costs) const;
int InfoType; /// Type of information to show.
unsigned int MaxWidth; /// Maximum width of multilined information.
@ -521,10 +521,10 @@ public:
CPopupContentTypeCosts() : Font(NULL), Centered(0) {}
virtual ~CPopupContentTypeCosts() {}
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *Costs) const;
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
virtual int GetWidth(const ButtonAction *button, int *Costs) const;
virtual int GetHeight(const ButtonAction *button, int *Costs) const;
virtual int GetWidth(const ButtonAction &button, int *Costs) const;
virtual int GetHeight(const ButtonAction &button, int *Costs) const;
CFont *Font; /// Font to use.
char Centered; /// if true, center the display.
@ -536,10 +536,10 @@ public:
CPopupContentTypeLine() : Color(ColorWhite), Width(0), Height(1) {}
virtual ~CPopupContentTypeLine() {}
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *Costs) const;
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
virtual int GetWidth(const ButtonAction *button, int *Costs) const;
virtual int GetHeight(const ButtonAction *button, int *Costs) const;
virtual int GetWidth(const ButtonAction &button, int *Costs) const;
virtual int GetHeight(const ButtonAction &button, int *Costs) const;
Uint32 Color; /// Color used for line.
unsigned int Width; /// line height
@ -555,10 +555,10 @@ public:
delete Text;
}
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *Costs) const;
virtual void Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const;
virtual int GetWidth(const ButtonAction *button, int *Costs) const;
virtual int GetHeight(const ButtonAction *button, int *Costs) const;
virtual int GetWidth(const ButtonAction &button, int *Costs) const;
virtual int GetHeight(const ButtonAction &button, int *Costs) const;
StringDesc *Text; /// Text to display.
CFont *Font; /// Font to use.

183
src/ui/botpanel.cpp
View file

@ -85,8 +85,8 @@ ButtonActionProxy CurrentButtons;
void InitButtons()
{
// Resolve the icon names.
for (int z = 0; z < (int)UnitButtonTable.size(); ++z) {
UnitButtonTable[z]->Icon.Load();
for (size_t i = 0; i != UnitButtonTable.size(); ++i) {
UnitButtonTable[i]->Icon.Load();
}
CurrentButtons.Reset();
}
@ -104,9 +104,7 @@ int AddButton(int pos, int level, const std::string &icon_ident,
const std::string &sound, const std::string &cursor, const std::string &umask, const std::string &popup)
{
char buf[2048];
ButtonAction *ba;
ba = new ButtonAction;
ButtonAction *ba = new ButtonAction;
Assert(ba);
ba->Pos = pos;
@ -191,9 +189,8 @@ int AddButton(int pos, int level, const std::string &icon_ident,
void CleanButtons()
{
// Free the allocated buttons.
for (int z = 0; z < (int)UnitButtonTable.size(); ++z) {
Assert(UnitButtonTable[z]);
delete UnitButtonTable[z];
for (size_t i = 0; i != UnitButtonTable.size(); ++i) {
delete UnitButtonTable[i];
}
UnitButtonTable.clear();
@ -213,21 +210,18 @@ void CleanButtons()
** @todo FIXME : add IconDisabled when needed.
** @todo FIXME : Should show the rally action for training unit ? (NewOrder)
*/
static int GetButtonStatus(const ButtonAction *button, int UnderCursor)
static int GetButtonStatus(const ButtonAction &button, int UnderCursor)
{
int res = 0;
int i;
Assert(button);
//Assert(NumSelected);
/* parallel drawing */
if (!NumSelected) {
return res;
}
// cursor is on that button
if (ButtonAreaUnderCursor == ButtonAreaButton && UnderCursor == button->Pos - 1) {
if (ButtonAreaUnderCursor == ButtonAreaButton && UnderCursor == button.Pos - 1) {
res |= IconActive;
if (MouseButtons & LeftButton) {
// Overwrite IconActive.
@ -236,7 +230,7 @@ static int GetButtonStatus(const ButtonAction *button, int UnderCursor)
}
unsigned int action = UnitActionNone;
switch (button->Action) {
switch (button.Action) {
case ButtonStop:
action = UnitActionStill;
break;
@ -272,7 +266,7 @@ static int GetButtonStatus(const ButtonAction *button, int UnderCursor)
return res;
}
// other cases : manage AutoCast and different possible action.
switch (button->Action) {
switch (button.Action) {
case ButtonMove:
for (i = 0; i < NumSelected; ++i) {
int saction = Selected[i]->CurrentAction();
@ -292,7 +286,7 @@ static int GetButtonStatus(const ButtonAction *button, int UnderCursor)
// Autocast
for (i = 0; i < NumSelected; ++i) {
Assert(Selected[i]->AutoCastSpell);
if (Selected[i]->AutoCastSpell[button->Value] != 1) {
if (Selected[i]->AutoCastSpell[button.Value] != 1) {
break;
}
}
@ -326,32 +320,32 @@ static int GetButtonStatus(const ButtonAction *button, int UnderCursor)
return res;
}
int CPopupContentTypeButtonInfo::GetWidth(const ButtonAction *button, int *) const
/* virtual */ int CPopupContentTypeButtonInfo::GetWidth(const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
std::string draw("");
switch (this->InfoType) {
case PopupButtonInfo_Hint:
draw = button->Hint;
draw = button.Hint;
break;
case PopupButtonInfo_Description:
draw = button->Description;
draw = button.Description;
break;
}
return this->MaxWidth ? std::min((unsigned int)font.getWidth(draw), this->MaxWidth) : font.getWidth(draw);
}
int CPopupContentTypeButtonInfo::GetHeight(const ButtonAction *button, int *) const
/* virtual */ int CPopupContentTypeButtonInfo::GetHeight(const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
int height = font.Height();
std::string draw("");
switch (this->InfoType) {
case PopupButtonInfo_Hint:
draw = button->Hint;
draw = button.Hint;
break;
case PopupButtonInfo_Description:
draw = button->Description;
draw = button.Description;
break;
}
if (this->MaxWidth && draw.length()) {
@ -363,17 +357,17 @@ int CPopupContentTypeButtonInfo::GetHeight(const ButtonAction *button, int *) co
return height;
}
void CPopupContentTypeButtonInfo::Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *) const
/* virtual */ void CPopupContentTypeButtonInfo::Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
CLabel label(font, "white", "red");
std::string draw("");
switch (this->InfoType) {
case PopupButtonInfo_Hint:
draw = button->Hint;
draw = button.Hint;
break;
case PopupButtonInfo_Description:
draw = button->Description;
draw = button.Description;
break;
}
std::string sub(draw);
@ -390,7 +384,7 @@ void CPopupContentTypeButtonInfo::Draw(int x, int y, const CPopup *popup, const
label.Draw(x, y, sub);
}
int CPopupContentTypeCosts::GetWidth(const ButtonAction *button, int *Costs) const
/* virtual */ int CPopupContentTypeCosts::GetWidth(const ButtonAction &button, int *Costs) const
{
int popupWidth = 0;
CFont &font = this->Font ? *this->Font : GetSmallFont();
@ -410,7 +404,7 @@ int CPopupContentTypeCosts::GetWidth(const ButtonAction *button, int *Costs) con
}
if (Costs[MaxCosts]) {
const CGraphic *G = UI.Resources[ManaResCost].G;
const SpellType *spell = SpellTypeTable[button->Value];
const SpellType *spell = SpellTypeTable[button.Value];
if (spell->ManaCost) {
popupWidth = 10;
@ -424,14 +418,14 @@ int CPopupContentTypeCosts::GetWidth(const ButtonAction *button, int *Costs) con
popupWidth += font.Width(spell->ManaCost);
popupWidth = std::max<int>(popupWidth, font.Width(spell->Name) + 10);
} else {
popupWidth = font.Width(button->Hint) + 10;
popupWidth = font.Width(button.Hint) + 10;
}
popupWidth = std::max<int>(popupWidth, 100);
}
return popupWidth;
}
int CPopupContentTypeCosts::GetHeight(const ButtonAction *button, int *Costs) const
/* virtual */ int CPopupContentTypeCosts::GetHeight(const ButtonAction &button, int *Costs) const
{
int popupHeight = 0;
CFont &font = this->Font ? *this->Font : GetSmallFont();
@ -444,7 +438,7 @@ int CPopupContentTypeCosts::GetHeight(const ButtonAction *button, int *Costs) co
return std::max(popupHeight, font.Height());
}
void CPopupContentTypeCosts::Draw(int x, int y, const CPopup *, const unsigned int, const ButtonAction *button, int *Costs) const
/* virtual */ void CPopupContentTypeCosts::Draw(int x, int y, const CPopup *, const unsigned int, const ButtonAction &button, int *Costs) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
CLabel label(font, "white", "red");
@ -466,7 +460,7 @@ void CPopupContentTypeCosts::Draw(int x, int y, const CPopup *, const unsigned i
}
}
if (Costs[MaxCosts]) {
const SpellType *spell = SpellTypeTable[button->Value];
const SpellType *spell = SpellTypeTable[button.Value];
const CGraphic *G = UI.Resources[ManaResCost].G;
if (spell->ManaCost) {
int y_offset = 0;
@ -484,38 +478,38 @@ void CPopupContentTypeCosts::Draw(int x, int y, const CPopup *, const unsigned i
}
}
int CPopupContentTypeLine::GetWidth(const ButtonAction *button, int *Costs) const
/* virtual */ int CPopupContentTypeLine::GetWidth(const ButtonAction &button, int *Costs) const
{
return this->Width;
}
int CPopupContentTypeLine::GetHeight(const ButtonAction *button, int *Costs) const
/* virtual */ int CPopupContentTypeLine::GetHeight(const ButtonAction &button, int *Costs) const
{
return this->Height;
}
void CPopupContentTypeLine::Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction *button, int *Costs) const
/* virtual */ void CPopupContentTypeLine::Draw(int x, int y, const CPopup *popup, const unsigned int popupWidth, const ButtonAction &button, int *Costs) const
{
Video.FillRectangle(this->Color, x - popup->MarginX - this->MarginX + 1,
y, this->Width && Width < popupWidth ? Width : popupWidth - 2, Height);
}
int CPopupContentTypeVariable::GetWidth(const ButtonAction *button, int *) const
/* virtual */ int CPopupContentTypeVariable::GetWidth(const ButtonAction &button, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
TriggerData.Type = UnitTypes[button->Value];
TriggerData.Type = UnitTypes[button.Value];
std::string text = EvalString(this->Text);
TriggerData.Type = NULL;
return font.getWidth(text);
}
int CPopupContentTypeVariable::GetHeight(const ButtonAction *, int *) const
/* virtual */ int CPopupContentTypeVariable::GetHeight(const ButtonAction &, int *) const
{
CFont &font = this->Font ? *this->Font : GetSmallFont();
return font.Height();
}
void CPopupContentTypeVariable::Draw(int x, int y, const CPopup *, const unsigned int, const ButtonAction *button, int *) const
/* virtual */ void CPopupContentTypeVariable::Draw(int x, int y, const CPopup *, const unsigned int, const ButtonAction &button, int *) const
{
std::string text; // Optional text to display.
CFont &font = this->Font ? *this->Font : GetSmallFont(); // Font to use.
@ -525,7 +519,7 @@ void CPopupContentTypeVariable::Draw(int x, int y, const CPopup *, const unsigne
CLabel label(font, "white", "red");
if (this->Text) {
TriggerData.Type = UnitTypes[button->Value];
TriggerData.Type = UnitTypes[button.Value];
text = EvalString(this->Text);
TriggerData.Type = NULL;
if (this->Centered) {
@ -536,7 +530,7 @@ void CPopupContentTypeVariable::Draw(int x, int y, const CPopup *, const unsigne
}
if (this->Index != -1) {
CUnitType &type = *UnitTypes[button->Value];
CUnitType &type = *UnitTypes[button.Value];
int value = type.DefaultStat.Variables[this->Index].Value;
int diff = type.Stats[ThisPlayer->Index].Variables[this->Index].Value - value;
@ -560,18 +554,18 @@ void CPopupContentTypeVariable::Draw(int x, int y, const CPopup *, const unsigne
** @return 0 if we can't show the content, else 1.
*/
static bool CanShowPopupContent(const PopupConditionPanel *condition,
const ButtonAction *button,
const ButtonAction &button,
CUnitType *type)
{
if (!condition) {
return true;
}
if (condition->HasHint && button->Hint.empty()) {
if (condition->HasHint && button.Hint.empty()) {
return false;
}
if (condition->HasDescription && button->Description.empty()) {
if (condition->HasDescription && button.Description.empty()) {
return false;
}
@ -591,7 +585,7 @@ static bool CanShowPopupContent(const PopupConditionPanel *condition,
return true;
}
static void GetPopupSize(const CPopup &popup, const ButtonAction *button, const CUIButton *uibutton,
static void GetPopupSize(const CPopup &popup, const ButtonAction &button,
int &popupWidth, int &popupHeight, int *Costs)
{
int contentWidth = popup.MarginX;
@ -606,7 +600,7 @@ static void GetPopupSize(const CPopup &popup, const ButtonAction *button, const
++it) {
CPopupContentType &content = **it;
if (CanShowPopupContent(content.Condition, button, UnitTypes[button->Value])) {
if (CanShowPopupContent(content.Condition, button, UnitTypes[button.Value])) {
// Automatically write the calculated coordinates.
content.PosX = contentWidth + content.MarginX;
content.PosY = popupHeight + content.MarginY;
@ -754,9 +748,9 @@ void DrawPopupUnitInfo(const CUnitType *type,
/**
** Draw popup
*/
void DrawPopup(const ButtonAction *button, const CUIButton *uibutton)
static void DrawPopup(const ButtonAction &button, const CUIButton *uibutton)
{
CPopup *popup = PopupByIdent(button->Popup);
CPopup *popup = PopupByIdent(button.Popup);
if (!popup) {
return;
@ -766,24 +760,24 @@ void DrawPopup(const ButtonAction *button, const CUIButton *uibutton)
int Costs[MaxCosts + 1];
memset(Costs, 0, sizeof(Costs));
switch (button->Action) {
switch (button.Action) {
case ButtonResearch:
memcpy(Costs, AllUpgrades[button->Value]->Costs, sizeof(AllUpgrades[button->Value]->Costs));
memcpy(Costs, AllUpgrades[button.Value]->Costs, sizeof(AllUpgrades[button.Value]->Costs));
break;
case ButtonSpellCast:
Costs[MaxCosts] = SpellTypeTable[button->Value]->ManaCost;
Costs[MaxCosts] = SpellTypeTable[button.Value]->ManaCost;
break;
case ButtonBuild:
case ButtonTrain:
case ButtonUpgradeTo:
memcpy(Costs, UnitTypes[button->Value]->Stats[ThisPlayer->Index].Costs,
sizeof(UnitTypes[button->Value]->Stats[ThisPlayer->Index].Costs));
memcpy(Costs, UnitTypes[button.Value]->Stats[ThisPlayer->Index].Costs,
sizeof(UnitTypes[button.Value]->Stats[ThisPlayer->Index].Costs));
break;
default:
break;
}
GetPopupSize(*popup, button, uibutton, popupWidth, popupHeight, Costs);
GetPopupSize(*popup, button, popupWidth, popupHeight, Costs);
popupWidth = std::max(popupWidth, popup->MinWidth);
popupHeight = std::max(popupHeight, popup->MinHeight);
int x = std::min<int>(uibutton->X, Video.Width - 1 - popupWidth);
@ -796,13 +790,13 @@ void DrawPopup(const ButtonAction *button, const CUIButton *uibutton)
// Contents
for (std::vector<CPopupContentType *>::const_iterator content = popup->Contents.begin();
content != popup->Contents.end(); ++content) {
if (CanShowPopupContent((*content)->Condition, button, UnitTypes[button->Value])) {
if (CanShowPopupContent((*content)->Condition, button, UnitTypes[button.Value])) {
(*content)->Draw(x + (*content)->PosX, y + (*content)->PosY, popup, popupWidth, button, Costs);
}
}
#if 0 // Fixme: need to remove soon
switch (button->Action) {
switch (button.Action) {
case ButtonResearch: {
CLabel label(font, "white", "red");
int *Costs = AllUpgrades[button->Value]->Costs;
@ -884,7 +878,7 @@ void DrawPopup(const ButtonAction *button, const CUIButton *uibutton)
label.Draw(x, y + y_offset, spell->ManaCost);
} else {
// Only Hint
label.Draw(x + 5, y + (popupHeight - font_height) / 2, button->Hint);
label.Draw(x + 5, y + (popupHeight - font_height) / 2, button->Hint);
}
}
break;
@ -964,7 +958,7 @@ void CButtonPanel::Draw()
// Draw main Icon.
//
buttons[i].Icon.Icon->DrawUnitIcon(UI.ButtonPanel.Buttons[i].Style,
GetButtonStatus(&buttons[i], ButtonUnderCursor),
GetButtonStatus(buttons[i], ButtonUnderCursor),
UI.ButtonPanel.Buttons[i].X, UI.ButtonPanel.Buttons[i].Y, buf);
//
@ -972,8 +966,8 @@ void CButtonPanel::Draw()
//
if (ButtonAreaUnderCursor == ButtonAreaButton &&
ButtonUnderCursor == i && KeyState != KeyStateInput) {
DrawPopup(&buttons[i], &UI.ButtonPanel.Buttons[i]);
UpdateStatusLineForButton(&buttons[i]);
DrawPopup(buttons[i], &UI.ButtonPanel.Buttons[i]);
UpdateStatusLineForButton(buttons[i]);
}
}
}
@ -983,29 +977,27 @@ void CButtonPanel::Draw()
**
** @param button Button
*/
void UpdateStatusLineForButton(const ButtonAction *button)
void UpdateStatusLineForButton(const ButtonAction &button)
{
const CUnitStats *stats;
Assert(button);
UI.StatusLine.Set(button->Hint);
switch (button->Action) {
UI.StatusLine.Set(button.Hint);
switch (button.Action) {
case ButtonBuild:
case ButtonTrain:
case ButtonUpgradeTo:
case ButtonUpgradeTo: {
// FIXME: store pointer in button table!
stats = &UnitTypes[button->Value]->Stats[ThisPlayer->Index];
SetCosts(0, UnitTypes[button->Value]->Demand, stats->Costs);
const CUnitStats &stats = UnitTypes[button.Value]->Stats[ThisPlayer->Index];
SetCosts(0, UnitTypes[button.Value]->Demand, stats.Costs);
break;
}
case ButtonResearch:
SetCosts(0, 0, AllUpgrades[button->Value]->Costs);
SetCosts(0, 0, AllUpgrades[button.Value]->Costs);
break;
case ButtonSpellCast:
SetCosts(SpellTypeTable[button->Value]->ManaCost, 0, NULL);
SetCosts(SpellTypeTable[button.Value]->ManaCost, 0, NULL);
break;
default:
ClearCosts();
break;
}
}
/*----------------------------------------------------------------------------
@ -1023,21 +1015,17 @@ void UpdateStatusLineForButton(const ButtonAction *button)
** @todo FIXME: better check. (dependancy, resource, ...)
** @todo FIXME: make difference with impossible and not yet researched.
*/
static bool IsButtonAllowed(const CUnit &unit, const ButtonAction *buttonaction)
static bool IsButtonAllowed(const CUnit &unit, const ButtonAction &buttonaction)
{
bool res;
Assert(buttonaction);
if (buttonaction->Allowed) {
return buttonaction->Allowed(unit, buttonaction);
if (buttonaction.Allowed) {
return buttonaction.Allowed(unit, buttonaction);
}
res = false;
bool res = false;
// FIXME: we have to check and if these unit buttons are available
// i.e. if button action is ButtonTrain for example check if
// required unit is not restricted etc...
switch (buttonaction->Action) {
switch (buttonaction.Action) {
case ButtonStop:
case ButtonStandGround:
case ButtonButton:
@ -1083,13 +1071,13 @@ static bool IsButtonAllowed(const CUnit &unit, const ButtonAction *buttonaction)
case ButtonUpgradeTo:
case ButtonResearch:
case ButtonBuild:
res = CheckDependByIdent(*unit.Player, buttonaction->ValueStr);
if (res && !strncmp(buttonaction->ValueStr.c_str(), "upgrade-", 8)) {
res = UpgradeIdentAllowed(*unit.Player, buttonaction->ValueStr) == 'A';
res = CheckDependByIdent(*unit.Player, buttonaction.ValueStr);
if (res && !strncmp(buttonaction.ValueStr.c_str(), "upgrade-", 8)) {
res = UpgradeIdentAllowed(*unit.Player, buttonaction.ValueStr) == 'A';
}
break;
case ButtonSpellCast:
res = SpellIsAvailable(*unit.Player, buttonaction->Value);
res = SpellIsAvailable(*unit.Player, buttonaction.Value);
break;
case ButtonUnload:
res = (Selected[0]->Type->CanTransport() && Selected[0]->BoardCount);
@ -1110,8 +1098,8 @@ static bool IsButtonAllowed(const CUnit &unit, const ButtonAction *buttonaction)
}
#if 0
// there is a additional check function -- call it
if (res && buttonaction->Disabled) {
return buttonaction->Disabled(unit, buttonaction);
if (res && buttonaction.Disabled) {
return buttonaction.Disabled(unit, buttonaction);
}
#endif
return res;
@ -1147,7 +1135,7 @@ static ButtonAction *UpdateButtonPanelMultipleUnits()
}
bool allow = true;
for (int i = 0; i < NumSelected; i++) {
if (!IsButtonAllowed(*Selected[i], UnitButtonTable[z])) {
if (!IsButtonAllowed(*Selected[i], *UnitButtonTable[z])) {
allow = false;
break;
}
@ -1178,8 +1166,8 @@ static ButtonAction *UpdateButtonPanelSingleUnit(const CUnit &unit)
{
ButtonAction *res = new ButtonAction[UI.ButtonPanel.Buttons.size()];
for (unsigned int z = 0; z < UI.ButtonPanel.Buttons.size(); ++z) {
res[z].Pos = -1;
for (size_t i = 0; i != UI.ButtonPanel.Buttons.size(); ++i) {
res[i].Pos = -1;
}
char unit_ident[128];
@ -1198,30 +1186,27 @@ static ButtonAction *UpdateButtonPanelSingleUnit(const CUnit &unit)
} else {
sprintf(unit_ident, ",%s,", unit.Type->Ident.c_str());
}
for (unsigned int z = 0; z < UnitButtonTable.size(); ++z) {
int pos; // keep position, modified if alt-buttons required
ButtonAction *buttonaction = UnitButtonTable[z];
Assert(0 < buttonaction->Pos && buttonaction->Pos <= (int)UI.ButtonPanel.Buttons.size());
for (size_t i = 0; i != UnitButtonTable.size(); ++i) {
ButtonAction &buttonaction = *UnitButtonTable[i];
Assert(0 < buttonaction.Pos && buttonaction.Pos <= (int)UI.ButtonPanel.Buttons.size());
// Same level
if (buttonaction->Level != CurrentButtonLevel) {
if (buttonaction.Level != CurrentButtonLevel) {
continue;
}
// any unit or unit in list
if (buttonaction->UnitMask[0] != '*' &&
!strstr(buttonaction->UnitMask.c_str(), unit_ident)) {
if (buttonaction.UnitMask[0] != '*'
&& !strstr(buttonaction.UnitMask.c_str(), unit_ident)) {
continue;
}
int allow = IsButtonAllowed(unit, buttonaction);
pos = buttonaction->Pos;
int pos = buttonaction.Pos;
// is button allowed after all?
if (allow) {
// OverWrite, So take last valid button.
res[pos - 1] = *buttonaction;
res[pos - 1] = buttonaction;
}
}
return res;

42
src/ui/button_checks.cpp
View file

@ -57,7 +57,7 @@
**
** @return True if enabled.
*/
bool ButtonCheckTrue(const CUnit &, const ButtonAction *)
bool ButtonCheckTrue(const CUnit &, const ButtonAction &)
{
return true;
}
@ -71,7 +71,7 @@ bool ButtonCheckTrue(const CUnit &, const ButtonAction *)
**
** @return True if enabled.
*/
bool ButtonCheckFalse(const CUnit &, const ButtonAction *)
bool ButtonCheckFalse(const CUnit &, const ButtonAction &)
{
return false;
}
@ -84,9 +84,9 @@ bool ButtonCheckFalse(const CUnit &, const ButtonAction *)
**
** @return True if enabled.
*/
bool ButtonCheckUpgrade(const CUnit &unit, const ButtonAction *button)
bool ButtonCheckUpgrade(const CUnit &unit, const ButtonAction &button)
{
return UpgradeIdentAllowed(*unit.Player, button->AllowStr) == 'R';
return UpgradeIdentAllowed(*unit.Player, button.AllowStr) == 'R';
}
/**
@ -97,10 +97,10 @@ bool ButtonCheckUpgrade(const CUnit &unit, const ButtonAction *button)
**
** @return True if enabled.
*/
bool ButtonCheckUnitsOr(const CUnit &unit, const ButtonAction *button)
bool ButtonCheckUnitsOr(const CUnit &unit, const ButtonAction &button)
{
CPlayer *player = unit.Player;
char *buf = new_strdup(button->AllowStr.c_str());
char *buf = new_strdup(button.AllowStr.c_str());
for (const char *s = strtok(buf, ","); s; s = strtok(NULL, ",")) {
if (player->HaveUnitTypeByIdent(s)) {
@ -120,10 +120,10 @@ bool ButtonCheckUnitsOr(const CUnit &unit, const ButtonAction *button)
**
** @return True if enabled.
*/
bool ButtonCheckUnitsAnd(const CUnit &unit, const ButtonAction *button)
bool ButtonCheckUnitsAnd(const CUnit &unit, const ButtonAction &button)
{
CPlayer *player = unit.Player;
char *buf = new_strdup(button->AllowStr.c_str());
char *buf = new_strdup(button.AllowStr.c_str());
for (const char *s = strtok(buf, ","); s; s = strtok(NULL, ",")) {
if (!player->HaveUnitTypeByIdent(s)) {
@ -145,7 +145,7 @@ bool ButtonCheckUnitsAnd(const CUnit &unit, const ButtonAction *button)
**
** @note: this check could also be moved into intialisation.
*/
bool ButtonCheckNetwork(const CUnit &, const ButtonAction *)
bool ButtonCheckNetwork(const CUnit &, const ButtonAction &)
{
return IsNetworkGame();
}
@ -160,7 +160,7 @@ bool ButtonCheckNetwork(const CUnit &, const ButtonAction *)
**
** @note: this check could also be moved into intialisation.
*/
bool ButtonCheckNoNetwork(const CUnit &, const ButtonAction *)
bool ButtonCheckNoNetwork(const CUnit &, const ButtonAction &)
{
return !IsNetworkGame();
}
@ -174,7 +174,7 @@ bool ButtonCheckNoNetwork(const CUnit &, const ButtonAction *)
**
** @return True if enabled.
*/
bool ButtonCheckNoWork(const CUnit &unit, const ButtonAction *)
bool ButtonCheckNoWork(const CUnit &unit, const ButtonAction &)
{
int action = unit.CurrentAction();
return action != UnitActionTrain
@ -190,7 +190,7 @@ bool ButtonCheckNoWork(const CUnit &unit, const ButtonAction *)
**
** @return True if enabled.
*/
bool ButtonCheckNoResearch(const CUnit &unit, const ButtonAction *)
bool ButtonCheckNoResearch(const CUnit &unit, const ButtonAction &)
{
int action = unit.CurrentAction();
return action != UnitActionUpgradeTo && action != UnitActionResearch;
@ -205,12 +205,12 @@ bool ButtonCheckNoResearch(const CUnit &unit, const ButtonAction *)
**
** @return True if enabled.
*/
bool ButtonCheckUpgradeTo(const CUnit &unit, const ButtonAction *button)
bool ButtonCheckUpgradeTo(const CUnit &unit, const ButtonAction &button)
{
if (unit.CurrentAction() != UnitActionStill) {
return false;
}
return CheckDependByIdent(*unit.Player, button->ValueStr);
return CheckDependByIdent(*unit.Player, button.ValueStr);
}
/**
@ -221,7 +221,7 @@ bool ButtonCheckUpgradeTo(const CUnit &unit, const ButtonAction *button)
**
** @return True if enabled.
*/
bool ButtonCheckAttack(const CUnit &unit, const ButtonAction *)
bool ButtonCheckAttack(const CUnit &unit, const ButtonAction &)
{
return unit.Type->CanAttack;
}
@ -234,7 +234,7 @@ bool ButtonCheckAttack(const CUnit &unit, const ButtonAction *)
**
** @return True if enabled.
*/
bool ButtonCheckResearch(const CUnit &unit, const ButtonAction *button)
bool ButtonCheckResearch(const CUnit &unit, const ButtonAction &button)
{
// don't show any if working
if (!ButtonCheckNoWork(unit, button)) {
@ -242,11 +242,11 @@ bool ButtonCheckResearch(const CUnit &unit, const ButtonAction *button)
}
// check if allowed
if (!CheckDependByIdent(*unit.Player, button->ValueStr)) {
if (!CheckDependByIdent(*unit.Player, button.ValueStr)) {
return false;
}
if (!strncmp(button->ValueStr.c_str(), "upgrade-", 8)
&& UpgradeIdentAllowed(*unit.Player, button->ValueStr) != 'A') {
if (!strncmp(button.ValueStr.c_str(), "upgrade-", 8)
&& UpgradeIdentAllowed(*unit.Player, button.ValueStr) != 'A') {
return false;
}
return true;
@ -261,10 +261,10 @@ bool ButtonCheckResearch(const CUnit &unit, const ButtonAction *button)
**
** @return True if enabled.
*/
bool ButtonCheckSingleResearch(const CUnit &unit, const ButtonAction *button)
bool ButtonCheckSingleResearch(const CUnit &unit, const ButtonAction &button)
{
if (ButtonCheckResearch(unit, button)
&& !unit.Player->UpgradeTimers.Upgrades[UpgradeIdByIdent(button->ValueStr)]) {
&& !unit.Player->UpgradeTimers.Upgrades[UpgradeIdByIdent(button.ValueStr)]) {
return true;
}
return false;

2
src/ui/mouse.cpp
View file

@ -2025,7 +2025,7 @@ void DrawPieMenu()
int i = GetPieUnderCursor();
if (i != -1 && KeyState != KeyStateInput && buttons[i].Pos != -1) {
UpdateStatusLineForButton(&buttons[i]);
UpdateStatusLineForButton(buttons[i]);
}
}