← 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_house.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_house.cpp

1

/* $Id: newgrf_house.cpp 18872 2010-01-21 01:38:13Z rubidium $ */

1

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

2

2

3

3

/*

4

4

* This file is part of OpenTTD.

99

99

100

100

static uint32 HouseGetRandomBits(const ResolverObject *object)

101

101

{

102

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

103

return (tile == INVALID_TILE || !IsTileType(tile, MP_HOUSE)) ? 0 : GetHouseRandomBits(tile);

102

/* Note: Towns build houses over houses. So during construction checks 'tile' may be a valid but unrelated house. */

103

TileIndex tile = object->u.house.tile;

104

assert(IsValidTile(tile) && (object->u.house.not_yet_constructed || IsTileType(tile, MP_HOUSE)));

105

return object->u.house.not_yet_constructed ? 0 : GetHouseRandomBits(tile);

104

106

}

105

107

106

108

static uint32 HouseGetTriggers(const ResolverObject *object)

107

109

{

108

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

109

return (tile == INVALID_TILE || !IsTileType(tile, MP_HOUSE)) ? 0 : GetHouseTriggers(tile);

110

/* Note: Towns build houses over houses. So during construction checks 'tile' may be a valid but unrelated house. */

111

TileIndex tile = object->u.house.tile;

112

assert(IsValidTile(tile) && (object->u.house.not_yet_constructed || IsTileType(tile, MP_HOUSE)));

113

return object->u.house.not_yet_constructed ? 0 : GetHouseTriggers(tile);

110

114

}

111

115

112

116

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

113

117

{

114

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

115

if (IsTileType(tile, MP_HOUSE)) SetHouseTriggers(tile, triggers);

118

TileIndex tile = object->u.house.tile;

119

assert(!object->u.house.not_yet_constructed && IsValidTile(tile) && IsTileType(tile, MP_HOUSE));

120

SetHouseTriggers(tile, triggers);

116

121

}

117

122

118

123

static uint32 GetNumHouses(HouseID house_id, const Town *town)

370

375

res->u.house.tile = tile;

371

376

res->u.house.town = town;

372

377

res->u.house.house_id = house_id;

378

res->u.house.not_yet_constructed = false;

373

379

374

380

res->callback = CBID_NO_CALLBACK;

375

381

res->callback_param1 = 0;

383

389

res->grffile = (hs != NULL ? hs->grffile : NULL);

384

390

}

385

391

386

uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile)

392

uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile, bool not_yet_constructed)

387

393

{

388

394

ResolverObject object;

389

395

const SpriteGroup *group;

390

396

397

assert(IsValidTile(tile) && (not_yet_constructed || IsTileType(tile, MP_HOUSE)));

398

391

399

NewHouseResolver(&object, house_id, tile, town);

392

400

object.callback = callback;

393

401

object.callback_param1 = param1;

394

402

object.callback_param2 = param2;

403

object.u.house.not_yet_constructed = not_yet_constructed;

395

404

396

405

group = SpriteGroup::Resolve(HouseSpec::Get(house_id)->spritegroup, &object);

397

406

if (group == NULL) return CALLBACK_FAILED;

Older »