← Back to branch summary

~ubuntu-branches/debian/squeeze/openttd/squeeze

~ubuntu-branches/debian/squeeze/openttd/squeeze

« back to all changes in this revision

Viewing changes to src/newgrf_industrytiles.cpp

Committer: Bazaar Package Importer
Author(s): Matthijs Kooijman
Date: 2010-07-01 08:14:02 UTC
mfrom: (1.1.12 upstream)
Revision ID: james.westby@ubuntu.com-20100701081402-98jmva0t3sqywxmi

Tags: 1.0.2-1

* [00c4efe] New upstream release 1.0.2.
* [c7b38fd] Break older openttd versions instead of Conflicting with
them.
* [36bd61f] Bump standards version to 3.9.0.

files added:
.pc/debian-changes-1.0.2-1

.pc/debian-changes-1.0.2-1/media

.pc/debian-changes-1.0.2-1/media/openttd.desktop.in

debian/patches/debian-changes-1.0.2-1

media/openttd.desktop.translation.awk

src/lang/unfinished/irish.txt

src/lang/unfinished/maltese.txt

files modified:
.pc/applied-patches

.pc/run-openttd-wrapper.patch/media/openttd.desktop.in

Makefile.bundle.in

Makefile.in

bin/ai/regression/regression.txt

changelog.txt

config.lib

debian/changelog

debian/control

debian/copyright

debian/patches/run-openttd-wrapper.patch *

debian/patches/series

known-bugs.txt

media/openttd.desktop.in

os/debian/changelog

os/os2/installer/make_installer.cmd

os/windows/installer/install.nsi

projects/determineversion.vbs

readme.txt

src/ai/api/ai_bridge.hpp

src/ai/api/ai_changelog.hpp

src/ai/api/ai_engine.cpp

src/ai/api/ai_industrytype.cpp

src/bridge_gui.cpp

src/build_vehicle_gui.cpp

src/clear_cmd.cpp

src/console.cpp

src/console_cmds.cpp

src/currency.cpp

src/engine.cpp

src/fileio.cpp

src/fileio_func.h

src/fontcache.cpp

src/genworld.cpp

src/group_gui.cpp

src/industry_cmd.cpp

src/industry_gui.cpp

src/landscape.cpp

src/lang/brazilian_portuguese.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/esperanto.txt

src/lang/estonian.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/galician.txt

src/lang/german.txt

src/lang/greek.txt

src/lang/hebrew.txt

src/lang/hungarian.txt

src/lang/indonesian.txt

src/lang/italian.txt

src/lang/korean.txt

src/lang/latvian.txt

src/lang/lithuanian.txt

src/lang/luxembourgish.txt

src/lang/norwegian_bokmal.txt

src/lang/norwegian_nynorsk.txt

src/lang/polish.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/serbian.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/swedish.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/lang/unfinished/basque.txt

src/lang/unfinished/frisian.txt

src/lang/unfinished/ido.txt

src/lang/unfinished/macedonian.txt

src/lang/unfinished/persian.txt

src/lang/unfinished/thai.txt

src/lang/unfinished/urdu.txt

src/lang/vietnamese.txt

src/misc_cmd.cpp

src/network/core/os_abstraction.h

src/network/core/tcp_game.h

src/network/network.cpp

src/network/network_content.cpp

src/network/network_func.h

src/network/network_gui.cpp

src/network/network_server.cpp

src/newgrf.cpp

src/newgrf_engine.cpp

src/newgrf_gui.cpp

src/newgrf_house.cpp

src/newgrf_house.h

src/newgrf_industries.cpp

src/newgrf_industrytiles.cpp

src/newgrf_spritegroup.h

src/news_gui.cpp

src/openttd.cpp

src/os/unix/crashlog_unix.cpp

src/os/unix/unix.cpp

src/os/windows/ottdres.rc.in

src/pathfinder/yapf/yapf_costrail.hpp

src/pathfinder/yapf/yapf_road.cpp

src/rail_cmd.cpp

src/rev.cpp.in

src/roadveh_cmd.cpp

src/saveload/afterload.cpp

src/script/script_scanner.cpp

src/settings.cpp

src/settings_internal.h

src/station.cpp

src/station_cmd.cpp

src/station_gui.cpp

src/station_gui.h

src/stdafx.h

src/strgen/strgen.cpp

src/string.cpp

src/string_func.h

src/string_type.h

src/strings.cpp

src/table/settings.h

src/table/station_land.h

src/terraform_gui.cpp

src/tile_map.h

src/town_cmd.cpp

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

src/vehicle_gui.cpp

src/vehicle_gui.h

src/viewport.cpp

src/waypoint.cpp

src/waypoint_gui.cpp

src/widgets/dropdown.cpp

src/window.cpp

src/window_gui.h

Show diffs side-by-side

added added

removed removed

src/newgrf_industrytiles.cpp

1

/* $Id: newgrf_industrytiles.cpp 19053 2010-02-07 12:04:44Z frosch $ */

1

/* $Id: newgrf_industrytiles.cpp 19855 2010-05-18 21:30:56Z rubidium $ */

2

2

3

3

/*

4

4

* This file is part of OpenTTD.

118

118

static uint32 IndustryTileGetRandomBits(const ResolverObject *object)

119

119

{

120

120

const TileIndex tile = object->u.industry.tile;

121

if (tile == INVALID_TILE || !IsTileType(tile, MP_INDUSTRY)) return 0;

122

return (object->scope == VSG_SCOPE_SELF) ? GetIndustryRandomBits(tile) : Industry::GetByTile(tile)->random;

121

const Industry *ind = object->u.industry.ind;

122

assert(ind != NULL && IsValidTile(tile));

123

assert(ind->index == INVALID_INDUSTRY || IsTileType(tile, MP_INDUSTRY));

124

125

return (object->scope == VSG_SCOPE_SELF) ?

126

(ind->index != INVALID_INDUSTRY ? GetIndustryRandomBits(tile) : 0) :

127

ind->random;

123

128

}

124

129

125

130

static uint32 IndustryTileGetTriggers(const ResolverObject *object)

126

131

{

127

132

const TileIndex tile = object->u.industry.tile;

128

if (tile == INVALID_TILE || !IsTileType(tile, MP_INDUSTRY)) return 0;

129

return (object->scope == VSG_SCOPE_SELF) ? GetIndustryTriggers(tile) : Industry::GetByTile(tile)->random_triggers;

133

const Industry *ind = object->u.industry.ind;

134

assert(ind != NULL && IsValidTile(tile));

135

assert(ind->index == INVALID_INDUSTRY || IsTileType(tile, MP_INDUSTRY));

136

if (ind->index == INVALID_INDUSTRY) return 0;

137

return (object->scope == VSG_SCOPE_SELF) ? GetIndustryTriggers(tile) : ind->random_triggers;

130

138

}

131

139

132

140

static void IndustryTileSetTriggers(const ResolverObject *object, int triggers)

133

141

{

134

142

const TileIndex tile = object->u.industry.tile;

135

if (tile == INVALID_TILE || !IsTileType(tile, MP_INDUSTRY)) return;

143

Industry *ind = object->u.industry.ind;

144

assert(ind != NULL && ind->index != INVALID_INDUSTRY && IsValidTile(tile) && IsTileType(tile, MP_INDUSTRY));

136

145

137

146

if (object->scope == VSG_SCOPE_SELF) {

138

147

SetIndustryTriggers(tile, triggers);

139

148

} else {

140

Industry::GetByTile(tile)->random_triggers = triggers;

149

ind->random_triggers = triggers;

141

150

}

142

151

}

143

152

194

203

ResolverObject object;

195

204

const SpriteGroup *group;

196

205

206

assert(industry != NULL && IsValidTile(tile));

207

assert(industry->index == INVALID_INDUSTRY || IsTileType(tile, MP_INDUSTRY));

208

197

209

NewIndustryTileResolver(&object, gfx_id, tile, industry);

198

210

object.callback = callback;

199

211

object.callback_param1 = param1;

385

397

{

386

398

ResolverObject object;

387

399

400

assert(IsValidTile(tile) && IsTileType(tile, MP_INDUSTRY));

401

388

402

IndustryGfx gfx = GetIndustryGfx(tile);

389

403

const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx);

390

404

Older »