dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup #9725: Replace cmd_helper related functions and remove cmd_helper.h.

Browse Source
This commit is contained in:
J0anJosep
2022-01-08 12:01:37 +01:00
committed by Michael Lutz
parent 09b71c97aa
commit d9a37c915f
22 changed files with 60 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/story.cpp
View File

@@ -10,7 +10,6 @@
#include "stdafx.h"
#include "story_base.h"
#include "core/pool_func.hpp"
#include "cmd_helper.h"
#include "command_func.h"
#include "company_base.h"
#include "company_func.h"
@@ -144,7 +143,9 @@ void StoryPageButtonData::SetVehicleType(VehicleType vehtype)
/** Get the button background colour. */
Colours StoryPageButtonData::GetColour() const
{
return Extract<Colours, 0, 8>(this->referenced_id);
Colours colour = (Colours)GB(this->referenced_id, 0, 8);
if (!IsValidColours(colour)) return INVALID_COLOUR;
return colour;
}
StoryPageButtonFlags StoryPageButtonData::GetFlags() const
@@ -155,7 +156,9 @@ StoryPageButtonFlags StoryPageButtonData::GetFlags() const
/** Get the mouse cursor used while waiting for input for the button. */
StoryPageButtonCursor StoryPageButtonData::GetCursor() const
{
return Extract<StoryPageButtonCursor, 8, 8>(this->referenced_id);
StoryPageButtonCursor cursor = (StoryPageButtonCursor)GB(this->referenced_id, 8, 8);
if (!IsValidStoryPageButtonCursor(cursor)) return INVALID_SPBC;
return cursor;
}
/** Get the type of vehicles that are accepted by the button */