mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Compilation warnings in story_gui and script_story_page 

See: #7896
pull/8174/head
Jonathan G Rennison 2020-05-27 21:09:31 +01:00 committed by Niels Martin Hansen
parent 71e9c2a71b
commit f11cd8f2d0
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/api/script_story_page.cpp
View File

@ -83,6 +83,10 @@ static inline bool StoryPageElementTypeRequiresText(StoryPageElementType type)
case SPET_BUTTON_VEHICLE: case SPET_BUTTON_VEHICLE:
refid = reference; refid = reference;
break; break;
case SPET_TEXT:
break;
default:
NOT_REACHED();
} }
if (!ScriptObject::DoCommand(reftile, if (!ScriptObject::DoCommand(reftile,
@ -124,6 +128,10 @@ static inline bool StoryPageElementTypeRequiresText(StoryPageElementType type)
case SPET_BUTTON_VEHICLE: case SPET_BUTTON_VEHICLE:
refid = reference; refid = reference;
break; break;
case SPET_TEXT:
break;
default:
NOT_REACHED();
} }
return ScriptObject::DoCommand(reftile, return ScriptObject::DoCommand(reftile,

8
src/story_gui.cpp
View File

@ -459,7 +459,7 @@ protected:
} }
} }
/* Position element in main column */ /* Position element in main column */
LayoutCacheElement ce{ pe }; LayoutCacheElement ce{ pe, {} };
ce.bounds.left = left_offset; ce.bounds.left = left_offset;
ce.bounds.right = max_width - right_offset; ce.bounds.right = max_width - right_offset;
ce.bounds.top = main_y; ce.bounds.top = main_y;
@ -479,7 +479,7 @@ protected:
std::vector<size_t> &cur_floats = (fl == ElementFloat::Left) ? left_floats : right_floats; std::vector<size_t> &cur_floats = (fl == ElementFloat::Left) ? left_floats : right_floats;
/* Position element */ /* Position element */
cur_width = max(cur_width, this->GetPageElementFloatWidth(*pe)); cur_width = max(cur_width, this->GetPageElementFloatWidth(*pe));
LayoutCacheElement ce{ pe }; LayoutCacheElement ce{ pe, {} };
ce.bounds.left = (fl == ElementFloat::Left) ? 0 : (max_width - cur_width); ce.bounds.left = (fl == ElementFloat::Left) ? 0 : (max_width - cur_width);
ce.bounds.right = (fl == ElementFloat::Left) ? cur_width : max_width; ce.bounds.right = (fl == ElementFloat::Left) ? cur_width : max_width;
ce.bounds.top = cur_y; ce.bounds.top = cur_y;
@ -745,11 +745,7 @@ public:
case SPET_BUTTON_PUSH: case SPET_BUTTON_PUSH:
case SPET_BUTTON_TILE: case SPET_BUTTON_TILE:
case SPET_BUTTON_VEHICLE: { case SPET_BUTTON_VEHICLE: {
const int height = FONT_HEIGHT_NORMAL;
const int tmargin = WD_BEVEL_TOP + WD_FRAMETEXT_TOP; const int tmargin = WD_BEVEL_TOP + WD_FRAMETEXT_TOP;
const int bmargin = WD_BEVEL_BOTTOM + WD_FRAMETEXT_BOTTOM;
const int width = ce.bounds.right - ce.bounds.left;
const int hmargin = width / 5;
const FrameFlags frame = this->active_button_id == ce.pe->index ? FR_LOWERED : FR_NONE; const FrameFlags frame = this->active_button_id == ce.pe->index ? FR_LOWERED : FR_NONE;
const Colours bgcolour = StoryPageButtonData{ ce.pe->referenced_id }.GetColour(); const Colours bgcolour = StoryPageButtonData{ ce.pe->referenced_id }.GetColour();