Merge branch 'master' into jgrpp
Remove 'byte' typedef
This commit is contained in:
@@ -64,7 +64,7 @@ void ShowSubsidiesList();
|
||||
|
||||
/* goal_gui.cpp */
|
||||
void ShowGoalsList(CompanyID company);
|
||||
void ShowGoalQuestion(uint16_t id, byte type, uint32_t button_mask, const std::string &question);
|
||||
void ShowGoalQuestion(uint16_t id, uint8_t type, uint32_t button_mask, const std::string &question);
|
||||
|
||||
/* story_gui.cpp */
|
||||
void ShowStoryBook(CompanyID company, uint16_t page_id = INVALID_STORY_PAGE, bool centered = false);
|
||||
@@ -76,7 +76,7 @@ void ShowExtraViewportWindowForTileUnderCursor();
|
||||
void ShowModifierKeyToggleWindow();
|
||||
|
||||
/* bridge_gui.cpp */
|
||||
void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transport_type, byte bridge_type);
|
||||
void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transport_type, uint8_t bridge_type);
|
||||
|
||||
/* music_gui.cpp */
|
||||
void ShowMusicWindow();
|
||||
|
Reference in New Issue
Block a user