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

Fix #6966: Only allow switching to a valid company.

pull/7005/head
Alberth 2018-12-29 13:31:31 +01:00 committed by Niels Martin Hansen
parent d8f6c80696
commit 4a255e879a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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