miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmclient update to 1.6.0

Browse Source
This commit is contained in:
Pavel Stupnikov
2016-04-02 01:07:50 +03:00
parent 91490343a4 5c9ef5a264
commit b8e7bd7462
223 changed files with 4097 additions and 3048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/industry_gui.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: industry_gui.cpp 26960 2014-10-05 11:20:02Z peter1138 $ */
/* $Id: industry_gui.cpp 27277 2015-05-09 09:24:19Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -44,12 +44,12 @@
#include "table/strings.h"
#include "hotkeys.h"
#include <bitset>
#include "safeguards.h"
bool _ignore_restrictions;
uint64 _displayed_industries; ///< Communication from the industry chain window to the smallmap window about what industries to display.
assert_compile(NUM_INDUSTRYTYPES <= 64); // Make sure all industry types fit in _displayed_industries.
std::bitset<NUM_INDUSTRYTYPES> _displayed_industries; ///< Communication from the industry chain window to the smallmap window about what industries to display.
/** Cargo suffix type (for which window is it requested) */
enum CargoSuffixType {
@@ -239,7 +239,7 @@ class BuildIndustryWindow : public Window {
* The tests performed after the enabled allow to load the industries
* In the same way they are inserted by grf (if any)
*/
for (uint8 i = 0; i < NUM_INDUSTRYTYPES; i++) {
for (uint i = 0; i < NUM_INDUSTRYTYPES; i++) {
IndustryType ind = _sorted_industry_types[i];
const IndustrySpec *indsp = GetIndustrySpec(ind);
if (indsp->enabled) {
@@ -2405,7 +2405,8 @@ struct IndustryCargoesWindow : public Window {
{
this->GetWidget<NWidgetCore>(WID_IC_CAPTION)->widget_data = STR_INDUSTRY_CARGOES_INDUSTRY_CAPTION;
this->ind_cargo = it;
_displayed_industries = 1ULL << it;
_displayed_industries.reset();
_displayed_industries.set(it);
this->fields.Clear();
CargoesRow *row = this->fields.Append();
@@ -2449,12 +2450,12 @@ struct IndustryCargoesWindow : public Window {
if (HasCommonValidCargo(central_sp->accepts_cargo, lengthof(central_sp->accepts_cargo), indsp->produced_cargo, lengthof(indsp->produced_cargo))) {
this->PlaceIndustry(1 + supp_count * num_indrows / num_supp, 0, it);
SetBit(_displayed_industries, it);
_displayed_industries.set(it);
supp_count++;
}
if (HasCommonValidCargo(central_sp->produced_cargo, lengthof(central_sp->produced_cargo), indsp->accepts_cargo, lengthof(indsp->accepts_cargo))) {
this->PlaceIndustry(1 + cust_count * num_indrows / num_cust, 4, it);
SetBit(_displayed_industries, it);
_displayed_industries.set(it);
cust_count++;
}
}
@@ -2483,7 +2484,7 @@ struct IndustryCargoesWindow : public Window {
{
this->GetWidget<NWidgetCore>(WID_IC_CAPTION)->widget_data = STR_INDUSTRY_CARGOES_CARGO_CAPTION;
this->ind_cargo = cid + NUM_INDUSTRYTYPES;
_displayed_industries = 0;
_displayed_industries.reset();
this->fields.Clear();
CargoesRow *row = this->fields.Append();
@@ -2518,12 +2519,12 @@ struct IndustryCargoesWindow : public Window {
if (HasCommonValidCargo(&cid, 1, indsp->produced_cargo, lengthof(indsp->produced_cargo))) {
this->PlaceIndustry(1 + supp_count * num_indrows / num_supp, 0, it);
SetBit(_displayed_industries, it);
_displayed_industries.set(it);
supp_count++;
}
if (HasCommonValidCargo(&cid, 1, indsp->accepts_cargo, lengthof(indsp->accepts_cargo))) {
this->PlaceIndustry(1 + cust_count * num_indrows / num_cust, 2, it);
SetBit(_displayed_industries, it);
_displayed_industries.set(it);
cust_count++;
}
}
@@ -2714,7 +2715,7 @@ struct IndustryCargoesWindow : public Window {
case WID_IC_IND_DROPDOWN: {
DropDownList *lst = new DropDownList;
for (uint8 i = 0; i < NUM_INDUSTRYTYPES; i++) {
for (uint i = 0; i < NUM_INDUSTRYTYPES; i++) {
IndustryType ind = _sorted_industry_types[i];
const IndustrySpec *indsp = GetIndustrySpec(ind);
if (!indsp->enabled) continue;
@@ -2801,7 +2802,7 @@ const int IndustryCargoesWindow::VERT_TEXT_PADDING = 5; ///< Vertical padding ar
static void ShowIndustryCargoesWindow(IndustryType id)
{
if (id >= NUM_INDUSTRYTYPES) {
for (uint8 i = 0; i < NUM_INDUSTRYTYPES; i++) {
for (uint i = 0; i < NUM_INDUSTRYTYPES; i++) {
const IndustrySpec *indsp = GetIndustrySpec(_sorted_industry_types[i]);
if (indsp->enabled) {
id = _sorted_industry_types[i];