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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/debug.cpp
This commit is contained in:
Jonathan G Rennison
2019-01-02 16:09:44 +00:00
parent afae7ca810 391bc45c41
commit 4f1d54564e
40 changed files with 491 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/script/api/game/game_window.hpp.sq
View File

@@ -440,6 +440,7 @@ void SQGSWindow_Register(Squirrel *engine)
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_CAPTION, "WID_SL_CAPTION");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_SORT_BYNAME, "WID_SL_SORT_BYNAME");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_SORT_BYDATE, "WID_SL_SORT_BYDATE");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_FILTER, "WID_SL_FILTER");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_BACKGROUND, "WID_SL_BACKGROUND");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_FILE_BACKGROUND, "WID_SL_FILE_BACKGROUND");
SQGSWindow.DefSQConst(engine, ScriptWindow::WID_SL_HOME_BUTTON, "WID_SL_HOME_BUTTON");

2
src/script/api/script_companymode.cpp
View File

@@ -10,6 +10,7 @@
/** @file script_companymode.cpp Implementation of ScriptCompanyMode. */
#include "../../stdafx.h"
#include "../../company_base.h"
#include "script_companymode.hpp"
#include "../../safeguards.h"
@@ -17,6 +18,7 @@
ScriptCompanyMode::ScriptCompanyMode(int company)
{
if (company < OWNER_BEGIN || company >= MAX_COMPANIES) company = INVALID_COMPANY;
if (!::Company::IsValidID(company)) company = INVALID_COMPANY;
this->last_company = ScriptObject::GetCompany();
ScriptObject::SetCompany((CompanyID)company);

3
src/script/api/script_window.hpp
View File

@@ -1025,7 +1025,7 @@ public:
};
/* automatically generated from ../../widgets/cheat_widget.h */
/** Widgets of the #CheatWindow class.. */
/** Widgets of the #CheatWindow class. */
enum CheatWidgets {
WID_C_PANEL = ::WID_C_PANEL, ///< Panel where all cheats are shown in.
};
@@ -1296,6 +1296,7 @@ public:
WID_SL_CAPTION = ::WID_SL_CAPTION, ///< Caption of the window.
WID_SL_SORT_BYNAME = ::WID_SL_SORT_BYNAME, ///< Sort by name button.
WID_SL_SORT_BYDATE = ::WID_SL_SORT_BYDATE, ///< Sort by date button.
WID_SL_FILTER = ::WID_SL_FILTER, ///< Filter list of files
WID_SL_BACKGROUND = ::WID_SL_BACKGROUND, ///< Background of window.
WID_SL_FILE_BACKGROUND = ::WID_SL_FILE_BACKGROUND, ///< Background of file selection.
WID_SL_HOME_BUTTON = ::WID_SL_HOME_BUTTON, ///< Home button.