src/landscape.cpp
author rubidium
Sun, 20 Apr 2008 11:12:07 +0000
changeset 9009 6684576ef32b
parent 8973 749e572f9378
child 9111 48ce04029fe4
permissions -rw-r--r--
(svn r12804) -Codechange: move the effect vehicle handling out of vehicle.cpp
2186
db48cf29b983 (svn r2701) Insert Id tags into all source files
tron
parents: 2163
diff changeset
     1
/* $Id$ */
db48cf29b983 (svn r2701) Insert Id tags into all source files
tron
parents: 2163
diff changeset
     2
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     3
#include "stdafx.h"
1891
862800791170 (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents: 1793
diff changeset
     4
#include "openttd.h"
5385
3868f2e6db9b (svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents: 4990
diff changeset
     5
#include "bridge_map.h"
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
     6
#include "heightmap.h"
3144
33e42feae531 (svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents: 3111
diff changeset
     7
#include "clear_map.h"
1349
15979a2e9001 (svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate
tron
parents: 1335
diff changeset
     8
#include "spritecache.h"
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
     9
#include <stdarg.h>
8225
cd84a95b6630 (svn r11788) -Fix (11787): makedepend doesn't mark delete files as changed...
rubidium
parents: 8151
diff changeset
    10
#include "viewport_func.h"
8116
8da76dcb3287 (svn r11677) -Codechange: move price and command related types/functions to their respective places.
rubidium
parents: 8108
diff changeset
    11
#include "command_func.h"
6343
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
    12
#include "landscape.h"
2159
f6284cf5fab0 (svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents: 2154
diff changeset
    13
#include "variables.h"
3144
33e42feae531 (svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents: 3111
diff changeset
    14
#include "void_map.h"
3111
750f37699a13 (svn r3714) Add functions to turn tiles into water and shore tiles
tron
parents: 3078
diff changeset
    15
#include "water_map.h"
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
    16
#include "tgp.h"
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
    17
#include "genworld.h"
8119
52b48108425a (svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
rubidium
parents: 8116
diff changeset
    18
#include "tile_cmd.h"
8130
d2eb7d04f6e1 (svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.
rubidium
parents: 8119
diff changeset
    19
#include "core/alloc_func.hpp"
8151
4cefeef74c28 (svn r11713) -Codechange: Move some declarations and definitions in a more logical disposition
belugas
parents: 8144
diff changeset
    20
#include "fios.h"
8131
160939e24ed3 (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents: 8130
diff changeset
    21
#include "window_func.h"
160939e24ed3 (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'
rubidium
parents: 8130
diff changeset
    22
#include "functions.h"
8140
0d0d8c94f84b (svn r11702) -Codechange: move all date related stuff to date*.
rubidium
parents: 8139
diff changeset
    23
#include "date_func.h"
8144
65cec0877b78 (svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes.
rubidium
parents: 8140
diff changeset
    24
#include "vehicle_func.h"
8270
e7c342f6b14c (svn r11834) -Codechange: only include settings_type.h if needed.
rubidium
parents: 8264
diff changeset
    25
#include "settings_type.h"
8380
174326093caa (svn r11947) -Feature: Make use of new sprites added by Action5 type 0D.
frosch
parents: 8270
diff changeset
    26
#include "water.h"
9009
6684576ef32b (svn r12804) -Codechange: move the effect vehicle handling out of vehicle.cpp
rubidium
parents: 8973
diff changeset
    27
#include "effectvehicle_func.h"
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    28
8264
b1e85998c7d3 (svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents: 8254
diff changeset
    29
#include "table/sprites.h"
b1e85998c7d3 (svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents: 8254
diff changeset
    30
183
ec2b02ea4c88 (svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents: 159
diff changeset
    31
extern const TileTypeProcs
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    32
	_tile_type_clear_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    33
	_tile_type_rail_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    34
	_tile_type_road_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    35
	_tile_type_town_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    36
	_tile_type_trees_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    37
	_tile_type_station_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    38
	_tile_type_water_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    39
	_tile_type_dummy_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    40
	_tile_type_industry_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    41
	_tile_type_tunnelbridge_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    42
	_tile_type_unmovable_procs;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    43
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    44
const TileTypeProcs * const _tile_type_procs[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    45
	&_tile_type_clear_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    46
	&_tile_type_rail_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    47
	&_tile_type_road_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    48
	&_tile_type_town_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    49
	&_tile_type_trees_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    50
	&_tile_type_station_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    51
	&_tile_type_water_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    52
	&_tile_type_dummy_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    53
	&_tile_type_industry_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    54
	&_tile_type_tunnelbridge_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    55
	&_tile_type_unmovable_procs,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    56
};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    57
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    58
/* landscape slope => sprite */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    59
const byte _tileh_to_sprite[32] = {
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4300
diff changeset
    60
	0, 1, 2, 3, 4, 5, 6,  7, 8, 9, 10, 11, 12, 13, 14, 0,
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4300
diff changeset
    61
	0, 0, 0, 0, 0, 0, 0, 16, 0, 0,  0, 17,  0, 15, 18, 0,
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    62
};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
    63
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    64
SnowLine *_snow_line = NULL;
1958
0266bb01a1e6 (svn r2464) Move definition of _inclined_tileh out of variables.h
tron
parents: 1902
diff changeset
    65
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    66
/**
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    67
 * Applys a foundation to a slope.
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    68
 *
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    69
 * @pre      Foundation and slope must be valid combined.
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    70
 * @param f  The #Foundation.
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    71
 * @param s  The #Slope to modify.
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    72
 * @return   Increment to the tile Z coordinate.
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    73
 */
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    74
uint ApplyFoundationToSlope(Foundation f, Slope *s)
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    75
{
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    76
	if (!IsFoundation(f)) return 0;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    77
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    78
	if (IsLeveledFoundation(f)) {
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    79
		*s = SLOPE_FLAT;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    80
		return TILE_HEIGHT;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    81
	}
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    82
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    83
	if (f != FOUNDATION_STEEP_BOTH && IsNonContinuousFoundation(f)) {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    84
		*s = HalftileSlope(*s, GetHalftileFoundationCorner(f));
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    85
		return 0;
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    86
	}
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    87
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    88
	if (IsSpecialRailFoundation(f)) {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    89
		*s = SlopeWithThreeCornersRaised(OppositeCorner(GetRailFoundationCorner(f)));
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    90
		return 0;
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    91
	}
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
    92
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    93
	uint dz = IsSteepSlope(*s) ? TILE_HEIGHT : 0;
7678
8917067dde87 (svn r11209) -Codechange: remove some magic numbers and bit magic with appropriate enums and functions. Patch by frosch.
rubidium
parents: 7335
diff changeset
    94
	Corner highest_corner = GetHighestSlopeCorner(*s);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    95
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    96
	switch (f) {
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    97
		case FOUNDATION_INCLINED_X:
7678
8917067dde87 (svn r11209) -Codechange: remove some magic numbers and bit magic with appropriate enums and functions. Patch by frosch.
rubidium
parents: 7335
diff changeset
    98
			*s = (((highest_corner == CORNER_W) || (highest_corner == CORNER_S)) ? SLOPE_SW : SLOPE_NE);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
    99
			break;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   100
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   101
		case FOUNDATION_INCLINED_Y:
7678
8917067dde87 (svn r11209) -Codechange: remove some magic numbers and bit magic with appropriate enums and functions. Patch by frosch.
rubidium
parents: 7335
diff changeset
   102
			*s = (((highest_corner == CORNER_S) || (highest_corner == CORNER_E)) ? SLOPE_SE : SLOPE_NW);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   103
			break;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   104
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   105
		case FOUNDATION_STEEP_LOWER:
7678
8917067dde87 (svn r11209) -Codechange: remove some magic numbers and bit magic with appropriate enums and functions. Patch by frosch.
rubidium
parents: 7335
diff changeset
   106
			*s = SlopeWithOneCornerRaised(highest_corner);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   107
			break;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   108
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   109
		case FOUNDATION_STEEP_BOTH:
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   110
			*s = HalftileSlope(SlopeWithOneCornerRaised(highest_corner), highest_corner);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   111
			break;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   112
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   113
		default: NOT_REACHED();
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   114
	}
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   115
	return dz;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   116
}
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   117
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   118
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   119
/**
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   120
 * Determines height at given coordinate of a slope
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   121
 * @param x x coordinate
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   122
 * @param y y coordinate
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   123
 * @param corners slope to examine
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   124
 * @return height of given point of given slope
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   125
 */
3636
a36cc46e754d (svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents: 3529
diff changeset
   126
uint GetPartialZ(int x, int y, Slope corners)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   127
{
7764
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   128
	if (IsHalftileSlope(corners)) {
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   129
		switch (GetHalftileSlopeCorner(corners)) {
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   130
			case CORNER_W:
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   131
				if (x - y >= 0) return GetSlopeMaxZ(corners);
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   132
				break;
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   133
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   134
			case CORNER_S:
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   135
				if (x - (y ^ 0xF) >= 0) return GetSlopeMaxZ(corners);
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   136
				break;
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   137
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   138
			case CORNER_E:
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   139
				if (y - x >= 0) return GetSlopeMaxZ(corners);
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   140
				break;
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   141
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   142
			case CORNER_N:
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   143
				if ((y ^ 0xF) - x >= 0) return GetSlopeMaxZ(corners);
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   144
				break;
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   145
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   146
			default: NOT_REACHED();
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   147
		}
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   148
	}
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   149
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   150
	int z = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   151
8413
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   152
	switch (RemoveHalftileSlope(corners)) {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   153
		case SLOPE_W:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   154
			if (x - y >= 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   155
				z = (x - y) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   156
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   157
			break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   158
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   159
		case SLOPE_S:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   160
			y ^= 0xF;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   161
			if ((x - y) >= 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   162
				z = (x - y) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   163
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   164
			break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   165
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   166
		case SLOPE_SW:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   167
			z = (x >> 1) + 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   168
			break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   169
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   170
		case SLOPE_E:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   171
			if (y - x >= 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   172
				z = (y - x) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   173
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   174
			break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   175
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   176
		case SLOPE_EW:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   177
		case SLOPE_NS:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   178
		case SLOPE_ELEVATED:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   179
			z = 4;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   180
			break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   181
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   182
		case SLOPE_SE:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   183
			z = (y >> 1) + 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   184
			break;
183
ec2b02ea4c88 (svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents: 159
diff changeset
   185
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   186
		case SLOPE_WSE:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   187
			z = 8;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   188
			y ^= 0xF;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   189
			if (x - y < 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   190
				z += (x - y) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   191
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   192
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   193
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   194
		case SLOPE_N:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   195
			y ^= 0xF;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   196
			if (y - x >= 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   197
				z = (y - x) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   198
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   199
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   200
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   201
		case SLOPE_NW:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   202
			z = (y ^ 0xF) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   203
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   204
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   205
		case SLOPE_NWS:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   206
			z = 8;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   207
			if (x - y < 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   208
				z += (x - y) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   209
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   210
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   211
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   212
		case SLOPE_NE:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   213
			z = (x ^ 0xF) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   214
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   215
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   216
		case SLOPE_ENW:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   217
			z = 8;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   218
			y ^= 0xF;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   219
			if (y - x < 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   220
				z += (y - x) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   221
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   222
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   223
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   224
		case SLOPE_SEN:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   225
			z = 8;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   226
			if (y - x < 0) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   227
				z += (y - x) >> 1;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   228
			}
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   229
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   230
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   231
		case SLOPE_STEEP_S:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   232
			z = 1 + ((x + y) >> 1);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   233
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   234
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   235
		case SLOPE_STEEP_W:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   236
			z = 1 + ((x + (y ^ 0xF)) >> 1);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   237
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   238
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   239
		case SLOPE_STEEP_N:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   240
			z = 1 + (((x ^ 0xF) + (y ^ 0xF)) >> 1);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   241
			break;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   242
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   243
		case SLOPE_STEEP_E:
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   244
			z = 1 + (((x ^ 0xF) + y) >> 1);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   245
			break;
3636
a36cc46e754d (svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents: 3529
diff changeset
   246
a36cc46e754d (svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums
tron
parents: 3529
diff changeset
   247
		default: break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   248
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   249
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   250
	return z;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   251
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   252
2951
2de6d3a59743 (svn r3510) Fiddle with whitespace and parentheses
tron
parents: 2934
diff changeset
   253
uint GetSlopeZ(int x, int y)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   254
{
4231
2823b3643862 (svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents: 4191
diff changeset
   255
	TileIndex tile = TileVirtXY(x, y);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   256
4231
2823b3643862 (svn r5794) Pass the TileIndex plus x and y coordinates into GetSlopeZ_* instead of a TileInfo
tron
parents: 4191
diff changeset
   257
	return _tile_type_procs[GetTileType(tile)]->get_slope_z_proc(tile, x, y);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   258
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   259
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   260
/**
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   261
 * Determine the Z height of a corner relative to TileZ.
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   262
 *
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   263
 * @pre The slope must not be a halftile slope.
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   264
 *
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   265
 * @param tileh The slope.
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   266
 * @param corner The corner.
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   267
 * @return Z position of corner relative to TileZ.
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   268
 */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   269
int GetSlopeZInCorner(Slope tileh, Corner corner)
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   270
{
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   271
	assert(!IsHalftileSlope(tileh));
8413
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   272
	return ((tileh & SlopeWithOneCornerRaised(corner)) != 0 ? TILE_HEIGHT : 0) + (tileh == SteepSlope(corner) ? TILE_HEIGHT : 0);
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   273
}
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   274
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   275
/**
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   276
 * Determine the Z height of the corners of a specific tile edge
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   277
 *
7764
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   278
 * @note If a tile has a non-continuous halftile foundation, a corner can have different heights wrt. it's edges.
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   279
 *
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   280
 * @pre z1 and z2 must be initialized (typ. with TileZ). The corner heights just get added.
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   281
 *
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   282
 * @param tileh The slope of the tile.
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   283
 * @param edge The edge of interest.
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   284
 * @param z1 Gets incremented by the height of the first corner of the edge. (near corner wrt. the camera)
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   285
 * @param z2 Gets incremented by the height of the second corner of the edge. (far corner wrt. the camera)
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   286
 */
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   287
void GetSlopeZOnEdge(Slope tileh, DiagDirection edge, int *z1, int *z2)
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   288
{
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   289
	static const Slope corners[4][4] = {
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   290
		/*    corner     |          steep slope
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   291
		 *  z1      z2   |       z1             z2        */
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   292
		{SLOPE_E, SLOPE_N, SLOPE_STEEP_E, SLOPE_STEEP_N}, // DIAGDIR_NE, z1 = E, z2 = N
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   293
		{SLOPE_S, SLOPE_E, SLOPE_STEEP_S, SLOPE_STEEP_E}, // DIAGDIR_SE, z1 = S, z2 = E
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   294
		{SLOPE_S, SLOPE_W, SLOPE_STEEP_S, SLOPE_STEEP_W}, // DIAGDIR_SW, z1 = S, z2 = W
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   295
		{SLOPE_W, SLOPE_N, SLOPE_STEEP_W, SLOPE_STEEP_N}, // DIAGDIR_NW, z1 = W, z2 = N
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   296
	};
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   297
7764
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   298
	int halftile_test = (IsHalftileSlope(tileh) ? SlopeWithOneCornerRaised(GetHalftileSlopeCorner(tileh)) : 0);
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   299
	if (halftile_test == corners[edge][0]) *z2 += TILE_HEIGHT; // The slope is non-continuous in z2. z2 is on the upper side.
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   300
	if (halftile_test == corners[edge][1]) *z1 += TILE_HEIGHT; // The slope is non-continuous in z1. z1 is on the upper side.
e594296e90f6 (svn r11313) -Codechange: prepare several pieces of code so the can handle some new slopes. Patch by frosch.
rubidium
parents: 7728
diff changeset
   301
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   302
	if ((tileh & corners[edge][0]) != 0) *z1 += TILE_HEIGHT; // z1 is raised
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   303
	if ((tileh & corners[edge][1]) != 0) *z2 += TILE_HEIGHT; // z2 is raised
8413
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   304
	if (RemoveHalftileSlope(tileh) == corners[edge][2]) *z1 += TILE_HEIGHT; // z1 is highest corner of a steep slope
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   305
	if (RemoveHalftileSlope(tileh) == corners[edge][3]) *z2 += TILE_HEIGHT; // z2 is highest corner of a steep slope
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   306
}
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   307
8413
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   308
/**
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   309
 * Get slope of a tile on top of a (possible) foundation
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   310
 * If a tile does not have a foundation, the function returns the same as GetTileSlope.
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   311
 *
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   312
 * @param tile The tile of interest.
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   313
 * @param z returns the z of the foundation slope. (Can be NULL, if not needed)
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   314
 * @return The slope on top of the foundation.
c7f3384330a3 (svn r11983) -Codechange: Add some helper functions for slopes and use them.
frosch
parents: 8380
diff changeset
   315
 */
8380
174326093caa (svn r11947) -Feature: Make use of new sprites added by Action5 type 0D.
frosch
parents: 8270
diff changeset
   316
Slope GetFoundationSlope(TileIndex tile, uint* z)
37
61bf1df68d82 (svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents: 0
diff changeset
   317
{
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   318
	Slope tileh = GetTileSlope(tile, z);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   319
	Foundation f = _tile_type_procs[GetTileType(tile)]->get_foundation_proc(tile, tileh);
8380
174326093caa (svn r11947) -Feature: Make use of new sprites added by Action5 type 0D.
frosch
parents: 8270
diff changeset
   320
	uint z_inc = ApplyFoundationToSlope(f, &tileh);
174326093caa (svn r11947) -Feature: Make use of new sprites added by Action5 type 0D.
frosch
parents: 8270
diff changeset
   321
	if (z != NULL) *z += z_inc;
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   322
	return tileh;
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   323
}
39
d177340ed556 (svn r40) Final slope graphics fix
dominik
parents: 37
diff changeset
   324
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   325
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   326
static bool HasFoundationNW(TileIndex tile, Slope slope_here, uint z_here)
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   327
{
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   328
	uint z;
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   329
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   330
	int z_W_here = z_here;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   331
	int z_N_here = z_here;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   332
	GetSlopeZOnEdge(slope_here, DIAGDIR_NW, &z_W_here, &z_N_here);
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   333
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   334
	Slope slope = GetFoundationSlope(TILE_ADDXY(tile, 0, -1), &z);
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   335
	int z_W = z;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   336
	int z_N = z;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   337
	GetSlopeZOnEdge(slope, DIAGDIR_SE, &z_W, &z_N);
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   338
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   339
	return (z_N_here > z_N) || (z_W_here > z_W);
37
61bf1df68d82 (svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents: 0
diff changeset
   340
}
61bf1df68d82 (svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents: 0
diff changeset
   341
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   342
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   343
static bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here)
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   344
{
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   345
	uint z;
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   346
7728
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   347
	int z_E_here = z_here;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   348
	int z_N_here = z_here;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   349
	GetSlopeZOnEdge(slope_here, DIAGDIR_NE, &z_E_here, &z_N_here);
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   350
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   351
	Slope slope = GetFoundationSlope(TILE_ADDXY(tile, -1, 0), &z);
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   352
	int z_E = z;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   353
	int z_N = z;
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   354
	GetSlopeZOnEdge(slope, DIAGDIR_SW, &z_E, &z_N);
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   355
68e794385dc9 (svn r11263) -Codechange: Reduce code duplication between DrawBridgePillars and HasFoundation{NW|NE}. Patch by frosch.
rubidium
parents: 7678
diff changeset
   356
	return (z_N_here > z_N) || (z_E_here > z_E);
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   357
}
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   358
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   359
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   360
void DrawFoundation(TileInfo *ti, Foundation f)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   361
{
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   362
	if (!IsFoundation(f)) return;
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   363
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   364
	/* Two part foundations must be drawn separately */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   365
	assert(f != FOUNDATION_STEEP_BOTH);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   366
7767
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   367
	uint sprite_block = 0;
4061
b90ec503a589 (svn r5351) -Fix: Several graphical glitches at adjacent tiles with foundations. Some borders were missing, some were superfluous
tron
parents: 4000
diff changeset
   368
	uint z;
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   369
	Slope slope = GetFoundationSlope(ti->tile, &z);
39
d177340ed556 (svn r40) Final slope graphics fix
dominik
parents: 37
diff changeset
   370
7767
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   371
	/* Select the needed block of foundations sprites
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   372
	 * Block 0: Walls at NW and NE edge
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   373
	 * Block 1: Wall  at        NE edge
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   374
	 * Block 2: Wall  at NW        edge
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   375
	 * Block 3: No walls at NW or NE edge
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   376
	 */
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   377
	if (!HasFoundationNW(ti->tile, slope, z)) sprite_block += 1;
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   378
	if (!HasFoundationNE(ti->tile, slope, z)) sprite_block += 2;
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   379
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   380
	/* Use the original slope sprites if NW and NE borders should be visible */
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   381
	SpriteID leveled_base = (sprite_block == 0 ? (int)SPR_FOUNDATION_BASE : (SPR_SLOPES_VIRTUAL_BASE + sprite_block * SPR_TRKFOUND_BLOCK_SIZE));
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   382
	SpriteID inclined_base = SPR_SLOPES_VIRTUAL_BASE + SPR_SLOPES_INCLINED_OFFSET + sprite_block * SPR_TRKFOUND_BLOCK_SIZE;
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   383
	SpriteID halftile_base = SPR_HALFTILE_FOUNDATION_BASE + sprite_block * SPR_HALFTILE_BLOCK_SIZE;
37
61bf1df68d82 (svn r38) Preliminary slopes graphics fix. Neighboring tile check not done yet
dominik
parents: 0
diff changeset
   384
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   385
	if (IsSteepSlope(ti->tileh)) {
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   386
		if (!IsNonContinuousFoundation(f)) {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   387
			/* Lower part of foundation */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   388
			AddSortableSpriteToDraw(
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   389
				leveled_base + (ti->tileh & ~SLOPE_STEEP), PAL_NONE, ti->x, ti->y, 16, 16, 7, ti->z
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   390
			);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   391
		}
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   392
7678
8917067dde87 (svn r11209) -Codechange: remove some magic numbers and bit magic with appropriate enums and functions. Patch by frosch.
rubidium
parents: 7335
diff changeset
   393
		Corner highest_corner = GetHighestSlopeCorner(ti->tileh);
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   394
		ti->z += ApplyFoundationToSlope(f, &ti->tileh);
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   395
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   396
		if (IsInclinedFoundation(f)) {
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   397
			/* inclined foundation */
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   398
			byte inclined = highest_corner * 2 + (f == FOUNDATION_INCLINED_Y ? 1 : 0);
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   399
7767
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   400
			AddSortableSpriteToDraw(inclined_base + inclined, PAL_NONE, ti->x, ti->y, 16, 16, 1, ti->z);
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   401
			OffsetGroundSprite(31, 9);
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   402
		} else if (f == FOUNDATION_STEEP_LOWER) {
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   403
			/* one corner raised */
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   404
			OffsetGroundSprite(31, 1);
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   405
		} else {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   406
			/* halftile foundation */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   407
			int x_bb = (((highest_corner == CORNER_W) || (highest_corner == CORNER_S)) ? 8 : 0);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   408
			int y_bb = (((highest_corner == CORNER_S) || (highest_corner == CORNER_E)) ? 8 : 0);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   409
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   410
			AddSortableSpriteToDraw(halftile_base + highest_corner, PAL_NONE, ti->x + x_bb, ti->y + y_bb, 8, 8, 7, ti->z + TILE_HEIGHT);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   411
			OffsetGroundSprite(31, 9);
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   412
		}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   413
	} else {
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   414
		if (IsLeveledFoundation(f)) {
7767
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   415
			/* leveled foundation */
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   416
			AddSortableSpriteToDraw(leveled_base + ti->tileh, PAL_NONE, ti->x, ti->y, 16, 16, 7, ti->z);
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   417
			OffsetGroundSprite(31, 1);
7770
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   418
		} else if (IsNonContinuousFoundation(f)) {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   419
			/* halftile foundation */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   420
			Corner halftile_corner = GetHalftileFoundationCorner(f);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   421
			int x_bb = (((halftile_corner == CORNER_W) || (halftile_corner == CORNER_S)) ? 8 : 0);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   422
			int y_bb = (((halftile_corner == CORNER_S) || (halftile_corner == CORNER_E)) ? 8 : 0);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   423
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   424
			AddSortableSpriteToDraw(halftile_base + halftile_corner, PAL_NONE, ti->x + x_bb, ti->y + y_bb, 8, 8, 7, ti->z);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   425
			OffsetGroundSprite(31, 9);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   426
		} else if (IsSpecialRailFoundation(f)) {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   427
			/* anti-zig-zag foundation */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   428
			SpriteID spr;
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   429
			if (ti->tileh == SLOPE_NS || ti->tileh == SLOPE_EW) {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   430
				/* half of leveled foundation under track corner */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   431
				spr = leveled_base + SlopeWithThreeCornersRaised(GetRailFoundationCorner(f));
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   432
			} else {
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   433
				/* tile-slope = sloped along X/Y, foundation-slope = three corners raised */
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   434
				spr = inclined_base + 2 * GetRailFoundationCorner(f) + ((ti->tileh == SLOPE_SW || ti->tileh == SLOPE_NE) ? 1 : 0);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   435
			}
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   436
			AddSortableSpriteToDraw(spr, PAL_NONE, ti->x, ti->y, 16, 16, 7, ti->z);
320d260ff1a1 (svn r11319) -Add: halftile- and anti-zig-zag-foundations. Patch by frosch.
rubidium
parents: 7767
diff changeset
   437
			OffsetGroundSprite(31, 9);
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   438
		} else {
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   439
			/* inclined foundation */
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   440
			byte inclined = GetHighestSlopeCorner(ti->tileh) * 2 + (f == FOUNDATION_INCLINED_Y ? 1 : 0);
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   441
7767
9866e9700e62 (svn r11316) -Codechange: add support for the half-tile (selection) graphics.
rubidium
parents: 7764
diff changeset
   442
			AddSortableSpriteToDraw(inclined_base + inclined, PAL_NONE, ti->x, ti->y, 16, 16, 1, ti->z);
4253
b468db807b66 (svn r5864) -Feature: Also allow horizontal and vertical rails on steep slopes
tron
parents: 4246
diff changeset
   443
			OffsetGroundSprite(31, 9);
4246
6dcc0e44a367 (svn r5833) -Feature: Allow building of (certain) rails, roads and bridge ramps on steep sloped tiles
tron
parents: 4240
diff changeset
   444
		}
7335
141c6b86ec1f (svn r10698) -Codechange [FS#1082]: simplify the code related to foundations. Primarily removal of (duplicated|magic) code and introduction of few helper functions to ease foundation determination. Patch by frosch.
rubidium
parents: 7304
diff changeset
   445
		ti->z += ApplyFoundationToSlope(f, &ti->tileh);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   446
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   447
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   448
1589
bac29165710f (svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents: 1384
diff changeset
   449
void DoClearSquare(TileIndex tile)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   450
{
3447
1c62c085638a (svn r4279) s/\<CL_/CLEAR_/
tron
parents: 3422
diff changeset
   451
	MakeClear(tile, CLEAR_GRASS, _generating_world ? 3 : 0);
2955
24de69e236d2 (svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents: 2952
diff changeset
   452
	MarkTileDirtyByTile(tile);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   453
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   454
8616
fd862a55c47f (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus().
frosch
parents: 8596
diff changeset
   455
/** Returns information about trackdirs and signal states.
8596
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   456
 * If there is any trackbit at 'side', return all trackdirbits.
8616
fd862a55c47f (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus().
frosch
parents: 8596
diff changeset
   457
 * For TRANSPORT_ROAD, return no trackbits if there is no roadbit (of given subtype) at given side.
8596
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   458
 * @param tile tile to get info about
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   459
 * @param mode transport type
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   460
 * @param sub_mode for TRANSPORT_ROAD, roadtypes to check
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   461
 * @param side side we are entering from, INVALID_DIAGDIR to return all trackbits
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   462
 * @return trackdirbits and other info depending on 'mode'
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   463
 */
8616
fd862a55c47f (svn r12199) -Codechange: Remove magic around the results of GetTileTrackStatus().
frosch
parents: 8596
diff changeset
   464
TrackStatus GetTileTrackStatus(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   465
{
8596
c3404405f3f5 (svn r12177) -Codechange: use 'side' parameter in GetTileTrackStatus so there can be less checks in pathfinders for depots/stations/tunnels/bridges
smatz
parents: 8450
diff changeset
   466
	return _tile_type_procs[GetTileType(tile)]->get_tile_track_status_proc(tile, mode, sub_mode, side);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   467
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   468
5587
167d9a91ef02 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
rubidium
parents: 5584
diff changeset
   469
void ChangeTileOwner(TileIndex tile, PlayerID old_player, PlayerID new_player)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   470
{
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   471
	_tile_type_procs[GetTileType(tile)]->change_tile_owner_proc(tile, old_player, new_player);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   472
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   473
1589
bac29165710f (svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents: 1384
diff changeset
   474
void GetAcceptedCargo(TileIndex tile, AcceptedCargo ac)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   475
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   476
	memset(ac, 0, sizeof(AcceptedCargo));
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   477
	_tile_type_procs[GetTileType(tile)]->get_accepted_cargo_proc(tile, ac);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   478
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   479
1589
bac29165710f (svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents: 1384
diff changeset
   480
void AnimateTile(TileIndex tile)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   481
{
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   482
	_tile_type_procs[GetTileType(tile)]->animate_tile_proc(tile);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   483
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   484
1589
bac29165710f (svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents: 1384
diff changeset
   485
void ClickTile(TileIndex tile)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   486
{
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   487
	_tile_type_procs[GetTileType(tile)]->click_tile_proc(tile);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   488
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   489
1589
bac29165710f (svn r2093) uint -> TileIndex, remove commented out code and a local variable, which was only used once
tron
parents: 1384
diff changeset
   490
void GetTileDesc(TileIndex tile, TileDesc *td)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   491
{
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   492
	_tile_type_procs[GetTileType(tile)]->get_tile_desc_proc(tile, td);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   493
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   494
6343
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   495
/**
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   496
 * Has a snow line table already been loaded.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   497
 * @return true if the table has been loaded already.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   498
 */
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   499
bool IsSnowLineSet(void)
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   500
{
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   501
	return _snow_line != NULL;
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   502
}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   503
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   504
/**
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   505
 * Set a variable snow line, as loaded from a newgrf file.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   506
 * @param table the 12 * 32 byte table containing the snowline for each day
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   507
 */
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   508
void SetSnowLine(byte table[SNOW_LINE_MONTHS][SNOW_LINE_DAYS])
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   509
{
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   510
	_snow_line = CallocT<SnowLine>(1);
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   511
	memcpy(_snow_line->table, table, sizeof(_snow_line->table));
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   512
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   513
	for (uint i = 0; i < SNOW_LINE_MONTHS; i++) {
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   514
		for (uint j = 0; j < SNOW_LINE_DAYS; j++) {
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   515
			_snow_line->highest_value = max(_snow_line->highest_value, table[i][j]);
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   516
		}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   517
	}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   518
}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   519
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   520
/**
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   521
 * Get the current snow line, either variable or static.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   522
 * @return the snow line height.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   523
 */
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   524
byte GetSnowLine(void)
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   525
{
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   526
	if (_snow_line == NULL) return _opt.snow_line;
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   527
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   528
	YearMonthDay ymd;
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   529
	ConvertDateToYMD(_date, &ymd);
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   530
	return _snow_line->table[ymd.month][ymd.day];
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   531
}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   532
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   533
/**
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   534
 * Get the highest possible snow line height, either variable or static.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   535
 * @return the highest snow line height.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   536
 */
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   537
byte HighestSnowLine(void)
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   538
{
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   539
	return _snow_line == NULL ? _opt.snow_line : _snow_line->highest_value;
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   540
}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   541
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   542
/**
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   543
 * Clear the variable snow line table and free the memory.
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   544
 */
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   545
void ClearSnowLine(void)
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   546
{
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   547
	free(_snow_line);
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   548
	_snow_line = NULL;
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   549
}
76d17f784c13 (svn r9371) -Feature: Add support for variable snow lines in the arctic climate, supplied
maedhros
parents: 6247
diff changeset
   550
1775
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed()
Darkvater
parents: 1589
diff changeset
   551
/** Clear a piece of landscape
3491
35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents: 3447
diff changeset
   552
 * @param tile tile to clear
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   553
 * @param flags of operation to conduct
1775
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed()
Darkvater
parents: 1589
diff changeset
   554
 * @param p1 unused
548dc04d50e2 (svn r2279) - Fix: Check the parameters of the first 10 Commands. While there also add proper comments for the functions and fix up CmdFailed()
Darkvater
parents: 1589
diff changeset
   555
 * @param p2 unused
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   556
 */
6943
1914f26aee04 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents: 6683
diff changeset
   557
CommandCost CmdLandscapeClear(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   558
{
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   559
	return _tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   560
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   561
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   562
/** Clear a big piece of landscape
3491
35d747bb5e82 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
tron
parents: 3447
diff changeset
   563
 * @param tile end tile of area dragging
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   564
 * @param p1 start tile of area dragging
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   565
 * @param flags of operation to conduct
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   566
 * @param p2 unused
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   567
 */
6943
1914f26aee04 (svn r10197) -Codechange: replace int32 with CommandCost where appropriate.
rubidium
parents: 6683
diff changeset
   568
CommandCost CmdClearArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   569
{
2934
3f29a7212713 (svn r3490) -Fix: A bunch (10) of off-by-one errors when checking if a TileIndex points to a tile on the map
tron
parents: 2639
diff changeset
   570
	if (p1 >= MapSize()) return CMD_ERROR;
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   571
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   572
	/* make sure sx,sy are smaller than ex,ey */
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   573
	int ex = TileX(tile);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   574
	int ey = TileY(tile);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   575
	int sx = TileX(p1);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   576
	int sy = TileY(p1);
6106
2898cd9417fd (svn r8841) -Fix
tron
parents: 5668
diff changeset
   577
	if (ex < sx) Swap(ex, sx);
2898cd9417fd (svn r8841) -Fix
tron
parents: 5668
diff changeset
   578
	if (ey < sy) Swap(ey, sy);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   579
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   580
	Money money = GetAvailableMoneyForCommand();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   581
	CommandCost cost(EXPENSES_CONSTRUCTION);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   582
	bool success = false;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   583
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   584
	for (int x = sx; x <= ex; ++x) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   585
		for (int y = sy; y <= ey; ++y) {
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   586
			CommandCost ret = DoCommand(TileXY(x, y), 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   587
			if (CmdFailed(ret)) continue;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   588
			success = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   589
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   590
			if (flags & DC_EXEC) {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   591
				money -= ret.GetCost();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   592
				if (ret.GetCost() > 0 && money < 0) {
6950
14ecb0acdfb4 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents: 6943
diff changeset
   593
					_additional_cash_required = ret.GetCost();
14ecb0acdfb4 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents: 6943
diff changeset
   594
					return cost;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   595
				}
3493
c77bcf04294d (svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices.
tron
parents: 3491
diff changeset
   596
				DoCommand(TileXY(x, y), 0, 0, flags, CMD_LANDSCAPE_CLEAR);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   597
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   598
				/* draw explosion animation... */
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   599
				if ((x == sx || x == ex) && (y == sy || y == ey)) {
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   600
					/* big explosion in each corner, or small explosion for single tiles */
3645
7f950533d510 (svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE}
tron
parents: 3636
diff changeset
   601
					CreateEffectVehicleAbove(x * TILE_SIZE + TILE_SIZE / 2, y * TILE_SIZE + TILE_SIZE / 2, 2,
1359
52782e5cf7c9 (svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents: 1350
diff changeset
   602
						sy == ey && sx == ex ? EV_EXPLOSION_SMALL : EV_EXPLOSION_LARGE
52782e5cf7c9 (svn r1863) Give the effect vehicle type enums more descriptive names and use the enum as parameter type for CreateEffectVehicle*()
tron
parents: 1350
diff changeset
   603
					);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   604
				}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   605
			}
6950
14ecb0acdfb4 (svn r10205) -Codechange: refactor returning of cost, so it can be more easily modified.
rubidium
parents: 6943
diff changeset
   606
			cost.AddCost(ret);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   607
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   608
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   609
1793
b9a37c98b468 (svn r2297) - CodeChange: server-check the next batch of commands.
Darkvater
parents: 1775
diff changeset
   610
	return (success) ? cost : CMD_ERROR;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   611
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   612
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   613
8973
749e572f9378 (svn r12765) -Codechange: move some stuff out of variables.h that required including other headers in variables.h.
rubidium
parents: 8817
diff changeset
   614
TileIndex _cur_tileloop_tile;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   615
#define TILELOOP_BITS 4
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   616
#define TILELOOP_SIZE (1 << TILELOOP_BITS)
6491
00dc414c909d (svn r9672) -Cleanup: lots of coding style fixes around operands.
rubidium
parents: 6357
diff changeset
   617
#define TILELOOP_ASSERTMASK ((TILELOOP_SIZE - 1) + ((TILELOOP_SIZE - 1) << MapLogX()))
927
94fec9843fd3 (svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c.
tron
parents: 926
diff changeset
   618
#define TILELOOP_CHKMASK (((1 << (MapLogX() - TILELOOP_BITS))-1) << TILELOOP_BITS)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   619
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   620
void RunTileLoop()
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   621
{
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   622
	TileIndex tile = _cur_tileloop_tile;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   623
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   624
	assert((tile & ~TILELOOP_ASSERTMASK) == 0);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   625
	uint count = (MapSizeX() / TILELOOP_SIZE) * (MapSizeY() / TILELOOP_SIZE);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   626
	do {
1214
8262981ac274 (svn r1718) Use the enum TileType as parameter/return type for [GS]etTileType() instead of plain int.
tron
parents: 1211
diff changeset
   627
		_tile_type_procs[GetTileType(tile)]->tile_loop_proc(tile);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   628
926
a6d140a6a4de (svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
tron
parents: 925
diff changeset
   629
		if (TileX(tile) < MapSizeX() - TILELOOP_SIZE) {
6201
bee01dc45e39 (svn r8987) -Cleanup: doxygen changes. Again. Mostly (still) @files missing tags and (more than just) a few comments style.
belugas
parents: 6106
diff changeset
   630
			tile += TILELOOP_SIZE; // no overflow
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   631
		} else {
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   632
			tile = TILE_MASK(tile - TILELOOP_SIZE * (MapSizeX() / TILELOOP_SIZE - 1) + TileDiffXY(0, TILELOOP_SIZE)); /* x would overflow, also increase y */
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   633
		}
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   634
	} while (--count != 0);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   635
	assert((tile & ~TILELOOP_ASSERTMASK) == 0);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   636
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   637
	tile += 9;
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   638
	if (tile & TILELOOP_CHKMASK) {
863
6a1444534f62 (svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
tron
parents: 857
diff changeset
   639
		tile = (tile + MapSizeX()) & TILELOOP_ASSERTMASK;
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   640
	}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   641
	_cur_tileloop_tile = tile;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   642
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   643
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   644
void InitializeLandscape()
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   645
{
3078
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   646
	uint maxx = MapMaxX();
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   647
	uint maxy = MapMaxY();
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   648
	uint sizex = MapSizeX();
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   649
3078
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   650
	uint y;
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   651
	for (y = 0; y < maxy; y++) {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   652
		uint x;
3078
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   653
		for (x = 0; x < maxx; x++) {
3447
1c62c085638a (svn r4279) s/\<CL_/CLEAR_/
tron
parents: 3422
diff changeset
   654
			MakeClear(sizex * y + x, CLEAR_GRASS, 3);
3078
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   655
			SetTileHeight(sizex * y + x, 0);
8450
73371bb82922 (svn r12020) -Documentation: Correct description of TropicZone.
frosch
parents: 8413
diff changeset
   656
			SetTropicZone(sizex * y + x, TROPICZONE_NORMAL);
5385
3868f2e6db9b (svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals)
celestar
parents: 4990
diff changeset
   657
			ClearBridgeMiddle(sizex * y + x);
3078
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   658
		}
cfce0beffa16 (svn r3667) Fix the cause of an assertion I triggered in r3665
tron
parents: 3076
diff changeset
   659
		MakeVoid(sizex * y + x);
2049
538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents: 1999
diff changeset
   660
	}
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   661
	for (uint x = 0; x < sizex; x++) MakeVoid(sizex * y + x);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   662
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   663
4344
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4300
diff changeset
   664
static const byte _genterrain_tbl_1[5] = { 10, 22, 33, 37, 4  };
7e123fec5b0b (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents: 4300
diff changeset
   665
static const byte _genterrain_tbl_2[5] = {  0,  0,  0,  0, 33 };
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   666
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   667
static void GenerateTerrain(int type, uint flag)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   668
{
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   669
	uint32 r = Random();
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   670
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   671
	const Sprite *templ = GetSprite((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   672
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   673
	uint x = r & MapMaxX();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   674
	uint y = (r >> MapLogX()) & MapMaxY();
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   675
2951
2de6d3a59743 (svn r3510) Fiddle with whitespace and parentheses
tron
parents: 2934
diff changeset
   676
	if (x < 2 || y < 2) return;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   677
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   678
	DiagDirection direction = (DiagDirection)GB(r, 22, 2);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   679
	uint w = templ->width;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   680
	uint h = templ->height;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   681
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   682
	if (DiagDirToAxis(direction) == AXIS_Y) Swap(w, h);
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   683
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   684
	const byte *p = templ->data;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   685
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   686
	if ((flag & 4) != 0) {
1273
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   687
		uint xw = x * MapSizeY();
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   688
		uint yw = y * MapSizeX();
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   689
		uint bias = (MapSizeX() + MapSizeY()) * 16;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   690
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   691
		switch (flag & 3) {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   692
			default: NOT_REACHED();
1273
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   693
			case 0:
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   694
				if (xw + yw > MapSize() - bias) return;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   695
				break;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   696
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   697
			case 1:
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   698
				if (yw < xw + bias) return;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   699
				break;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   700
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   701
			case 2:
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   702
				if (xw + yw < MapSize() + bias) return;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   703
				break;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   704
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   705
			case 3:
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   706
				if (xw < yw + bias) return;
e4849a568647 (svn r1777) Fix map generation for tropical and arctic landscape on larger/smaller maps
tron
parents: 1247
diff changeset
   707
				break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   708
		}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   709
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   710
2951
2de6d3a59743 (svn r3510) Fiddle with whitespace and parentheses
tron
parents: 2934
diff changeset
   711
	if (x + w >= MapMaxX() - 1) return;
2de6d3a59743 (svn r3510) Fiddle with whitespace and parentheses
tron
parents: 2934
diff changeset
   712
	if (y + h >= MapMaxY() - 1) return;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   713
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   714
	Tile *tile = &_m[TileXY(x, y)];
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   715
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   716
	switch (direction) {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   717
		default: NOT_REACHED();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   718
		case DIAGDIR_NE:
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   719
			do {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   720
				Tile *tile_cur = tile;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   721
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   722
				for (uint w_cur = w; w_cur != 0; --w_cur) {
2049
538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents: 1999
diff changeset
   723
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   724
					p++;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   725
					tile_cur++;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   726
				}
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   727
				tile += TileDiffXY(0, 1);
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   728
			} while (--h != 0);
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   729
			break;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   730
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   731
		case DIAGDIR_SE:
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   732
			do {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   733
				Tile *tile_cur = tile;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   734
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   735
				for (uint h_cur = h; h_cur != 0; --h_cur) {
2049
538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents: 1999
diff changeset
   736
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   737
					p++;
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   738
					tile_cur += TileDiffXY(0, 1);
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   739
				}
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   740
				tile += TileDiffXY(1, 0);
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   741
			} while (--w != 0);
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   742
			break;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   743
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   744
		case DIAGDIR_SW:
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   745
			tile += TileDiffXY(w - 1, 0);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   746
			do {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   747
				Tile *tile_cur = tile;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   748
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   749
				for (uint w_cur = w; w_cur != 0; --w_cur) {
2049
538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents: 1999
diff changeset
   750
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   751
					p++;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   752
					tile_cur--;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   753
				}
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   754
				tile += TileDiffXY(0, 1);
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   755
			} while (--h != 0);
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   756
			break;
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   757
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   758
		case DIAGDIR_NW:
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   759
			tile += TileDiffXY(0, h - 1);
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   760
			do {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   761
				Tile *tile_cur = tile;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   762
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   763
				for (uint h_cur = h; h_cur != 0; --h_cur) {
2049
538e73c53f54 (svn r2558) Change the internal map format from 7 arrays to one array of structs, this doesn't change the saved format for now. It's a stepping stone for further changes.
tron
parents: 1999
diff changeset
   764
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   765
					p++;
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   766
					tile_cur -= TileDiffXY(0, 1);
1278
952095d83a1a (svn r1782) Remove line which should've been removed in r1779 and caused map generation to hang infinitely
tron
parents: 1275
diff changeset
   767
				}
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   768
				tile += TileDiffXY(1, 0);
1275
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   769
			} while (--w != 0);
5d1b5fe31c78 (svn r1779) Make the map generation code slightly more readable
tron
parents: 1273
diff changeset
   770
			break;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   771
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   772
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   773
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   774
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   775
#include "table/genland.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   776
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   777
static void CreateDesertOrRainForest()
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   778
{
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   779
	TileIndex update_freq = MapSize() / 4;
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   780
	const TileIndexDiffC *data;
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   781
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   782
	for (TileIndex tile = 0; tile != MapSize(); ++tile) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   783
		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   784
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   785
		for (data = _make_desert_or_rainforest_data;
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   786
				data != endof(_make_desert_or_rainforest_data); ++data) {
1184
9792417da988 (svn r1686) Fix (Work around?) crash when generating tropical maps
tron
parents: 1181
diff changeset
   787
			TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
1044
63e0601a43cc (svn r1545) Add TileHeight() which returns the height (not multiplied by 8)
tron
parents: 1035
diff changeset
   788
			if (TileHeight(t) >= 4 || IsTileType(t, MP_WATER)) break;
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   789
		}
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   790
		if (data == endof(_make_desert_or_rainforest_data))
3379
50b253bb9819 (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear.
belugas
parents: 3297
diff changeset
   791
			SetTropicZone(tile, TROPICZONE_DESERT);
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   792
	}
183
ec2b02ea4c88 (svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents: 159
diff changeset
   793
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   794
	for (uint i = 0; i != 256; i++) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   795
		if ((i % 64) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   796
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   797
		RunTileLoop();
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   798
	}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   799
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   800
	for (TileIndex tile = 0; tile != MapSize(); ++tile) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   801
		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   802
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   803
		for (data = _make_desert_or_rainforest_data;
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   804
				data != endof(_make_desert_or_rainforest_data); ++data) {
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   805
			TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
3447
1c62c085638a (svn r4279) s/\<CL_/CLEAR_/
tron
parents: 3422
diff changeset
   806
			if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break;
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   807
		}
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   808
		if (data == endof(_make_desert_or_rainforest_data))
3379
50b253bb9819 (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear.
belugas
parents: 3297
diff changeset
   809
			SetTropicZone(tile, TROPICZONE_RAINFOREST);
909
65cdb609b7a6 (svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
tron
parents: 889
diff changeset
   810
	}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   811
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   812
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   813
void GenerateLandscape(byte mode)
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   814
{
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   815
	static const int gwp_desert_amount = 4 + 8;
183
ec2b02ea4c88 (svn r184) -Fix: starting a new game in DesertLandscape crashed the game
truelight
parents: 159
diff changeset
   816
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   817
	if (mode == GW_HEIGHTMAP) {
6357
f0f5e7d1713c (svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents: 6343
diff changeset
   818
		SetGeneratingWorldProgress(GWP_LANDSCAPE, (_opt.landscape == LT_TROPIC) ? 1 + gwp_desert_amount : 1);
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   819
		LoadHeightmap(_file_to_saveload.name);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   820
		IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   821
	} else if (_patches.land_generator == LG_TERRAGENESIS) {
6357
f0f5e7d1713c (svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents: 6343
diff changeset
   822
		SetGeneratingWorldProgress(GWP_LANDSCAPE, (_opt.landscape == LT_TROPIC) ? 3 + gwp_desert_amount : 3);
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   823
		GenerateTerrainPerlin();
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   824
	} else {
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   825
		switch (_opt.landscape) {
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   826
			case LT_ARCTIC: {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   827
				SetGeneratingWorldProgress(GWP_LANDSCAPE, 2);
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   828
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   829
				uint32 r = Random();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   830
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   831
				for (uint i = ScaleByMapSize(GB(r, 0, 7) + 950); i != 0; --i) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   832
					GenerateTerrain(2, 0);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   833
				}
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   834
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
3017
a75caf4efa2d (svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents: 2955
diff changeset
   835
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   836
				uint flag = GB(r, 7, 2) | 4;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   837
				for (uint i = ScaleByMapSize(GB(r, 9, 7) + 450); i != 0; --i) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   838
					GenerateTerrain(4, flag);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   839
				}
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   840
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   841
			} break;
3017
a75caf4efa2d (svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff
tron
parents: 2955
diff changeset
   842
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   843
			case LT_TROPIC: {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   844
				SetGeneratingWorldProgress(GWP_LANDSCAPE, 3 + gwp_desert_amount);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   845
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   846
				uint32 r = Random();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   847
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   848
				for (uint i = ScaleByMapSize(GB(r, 0, 7) + 170); i != 0; --i) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   849
					GenerateTerrain(0, 0);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   850
				}
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   851
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   852
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   853
				uint flag = GB(r, 7, 2) | 4;
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   854
				for (uint i = ScaleByMapSize(GB(r, 9, 8) + 1700); i != 0; --i) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   855
					GenerateTerrain(0, flag);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   856
				}
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   857
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   858
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   859
				flag ^= 2;
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   860
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   861
				for (uint i = ScaleByMapSize(GB(r, 17, 7) + 410); i != 0; --i) {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   862
					GenerateTerrain(3, flag);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   863
				}
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   864
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   865
			} break;
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   866
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   867
			default: {
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   868
				SetGeneratingWorldProgress(GWP_LANDSCAPE, 1);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   869
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   870
				uint32 r = Random();
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   871
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   872
				uint i = ScaleByMapSize(GB(r, 0, 7) + (3 - _opt.diff.quantity_sea_lakes) * 256 + 100);
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   873
				for (; i != 0; --i) {
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   874
					GenerateTerrain(_opt.diff.terrain_type, 0);
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   875
				}
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   876
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
8817
952aeb4bdbfb (svn r12563) -Cleanup: variable scope and a bit of coding style in landscape.cpp
smatz
parents: 8651
diff changeset
   877
			} break;
4300
c7e43c47a2b9 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
truelight
parents: 4253
diff changeset
   878
		}
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   879
	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   880
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   881
	ConvertGroundTilesIntoWaterTiles();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   882
6357
f0f5e7d1713c (svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents: 6343
diff changeset
   883
	if (_opt.landscape == LT_TROPIC) CreateDesertOrRainForest();
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   884
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   885
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   886
void OnTick_Town();
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   887
void OnTick_Trees();
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   888
void OnTick_Station();
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   889
void OnTick_Industry();
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   890
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   891
void OnTick_Players();
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   892
void OnTick_Train();
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   893
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6201
diff changeset
   894
void CallLandscapeTick()
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   895
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   896
	OnTick_Town();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   897
	OnTick_Trees();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   898
	OnTick_Station();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   899
	OnTick_Industry();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   900
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   901
	OnTick_Players();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   902
	OnTick_Train();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   903
}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   904
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   905
TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   906
{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   907
	int rn = rng;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   908
	uint32 r = Random();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   909
1981
3c9c682f1212 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY
tron
parents: 1980
diff changeset
   910
	return TILE_MASK(TileXY(
2150
f710b959b1c4 (svn r2660) Get rid of some more shifting/anding/casting
tron
parents: 2140
diff changeset
   911
		TileX(a) + (GB(r, 0, 8) * rn * 2 >> 8) - rn,
f710b959b1c4 (svn r2660) Get rid of some more shifting/anding/casting
tron
parents: 2140
diff changeset
   912
		TileY(a) + (GB(r, 8, 8) * rn * 2 >> 8) - rn
1174
6a5e747f3ba6 (svn r1676) Increase the size of TileIndex and TileIndexDiff to 32bits and adapt the save/load data and some other parts of the code to that change
tron
parents: 1140
diff changeset
   913
	));
0
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN
truelight
parents:
diff changeset
   914
}