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

« back to all changes in this revision

Viewing changes to src/town_cmd.cpp

Committer: Bazaar Package Importer
Author(s): Matthijs Kooijman, cdcb73a
Date: 2009-12-24 00:55:45 UTC
mfrom: (1.1.9 upstream) (2.1.7 squeeze)
Revision ID: james.westby@ubuntu.com-20091224005545-ffwi801t8mvqtgwz

[cdcb73a] Imported Upstream version 0.7.5. This release fixes
CVE-2009-4007.

files added:
debian/gbp.conf

files modified:
bin/data/openttdd.grf

bin/data/openttdw.grf

bin/data/orig_dos.obg

bin/data/orig_dos_de.obg

bin/data/orig_win.obg

changelog.txt

config.lib

debian/changelog

debian/control

known-bugs.txt

os/debian/changelog

os/rpm/openttd.spec

os/win32/installer/install.nsi

projects/determineversion.vbs

readme.txt

src/ai/ai_info.cpp

src/ai/ai_info.hpp

src/ai/api/ai_changelog.hpp

src/ai/api/ai_order.cpp

src/ai/api/ai_vehicle.cpp

src/core/alloc_type.hpp

src/debug.h

src/engine.cpp

src/genworld.cpp

src/gfx.cpp

src/gfx_func.h

src/main_gui.cpp

src/misc.cpp

src/misc_gui.cpp

src/music/allegro_m.h

src/music/extmidi.h

src/music/null_m.h

src/music_gui.cpp

src/network/network.cpp

src/network/network_chat_gui.cpp

src/network/network_content_gui.cpp

src/newgrf.cpp

src/newgrf_gui.cpp

src/newgrf_industries.cpp

src/newgrf_spritegroup.cpp

src/newgrf_spritegroup.h

src/newgrf_text.cpp

src/order_cmd.cpp

src/ottdres.rc.in

src/pbs.cpp

src/rev.cpp.in

src/roadveh_cmd.cpp

src/saveload/misc_sl.cpp

src/saveload/oldloader_sl.cpp

src/saveload/saveload_internal.h

src/screenshot.cpp

src/script/squirrel.cpp

src/sdl.cpp

src/settings.cpp

src/smallmap_gui.cpp

src/sound/allegro_s.h

src/sound/null_s.h

src/spriteloader/grf.cpp

src/station_cmd.cpp

src/stdafx.h

src/table/engines.h

src/table/industry_land.h

src/town_cmd.cpp

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

src/video/allegro_v.cpp

src/video/allegro_v.h

src/video/sdl_v.cpp

src/video/win32_v.cpp

src/viewport.cpp

src/win32.cpp

src/window.cpp

src/window_gui.h

src/zoom_func.h

src/zoom_type.h

Show diffs side-by-side

added added

removed removed

src/town_cmd.cpp

/* $Id: town_cmd.cpp 17629 2009-09-24 19:22:32Z rubidium $ */

/* $Id: town_cmd.cpp 18477 2009-12-13 00:24:53Z rubidium $ */

/** @file town_cmd.cpp Handling of town tiles. */

760

}

761

762

cur_slope = _settings_game.construction.build_on_slopes ? GetFoundationSlope(tile, NULL) : GetTileSlope(tile, NULL);

763

if (cur_slope == SLOPE_FLAT) {

764

no_slope:

765

/* Tile has no slope */

766

switch (t->layout) {

767

default: NOT_REACHED();

768

769

case TL_ORIGINAL: // Disallow the road if any neighboring tile has a road (distance: 1)

770

return !IsNeighborRoadTile(tile, dir, 1);

771

772

case TL_BETTER_ROADS: // Disallow the road if any neighboring tile has a road (distance: 1 and 2).

773

return !IsNeighborRoadTile(tile, dir, 2);

774

}

775

}

763

bool ret = !IsNeighborRoadTile(tile, dir, t->layout == TL_ORIGINAL ? 1 : 2);

764

if (cur_slope == SLOPE_FLAT) return ret;

776

765

777

766

/* If the tile is not a slope in the right direction, then

778

767

* maybe terraform some. */

787

776

}

788

777

if (CmdFailed(res) && Chance16(1, 3)) {

789

778

/* We can consider building on the slope, though. */

790

goto no_slope;

779

return ret;

791

780

}

792

781

}

793

782

return false;

794

783

}

795

return true;

784

return ret;

796

785

}

797

786

}

798

787

Older »