5352e9fbcb
(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
19 years ago
34a9da4a32
(svn r3561) Don't use FindLandscapeHeightByTile() when it's overkill. Also use a sprite enum instead of a magic number.
19 years ago
17ec6ed70d
(svn r3520) Remove unused parameters from some functions
19 years ago
1c3e8630fe
(svn r3511) More whitespace ([FS#46] by Rubidium)
19 years ago
9712d6f639
(svn r3510) Fiddle with whitespace and parentheses
19 years ago
7d17583a29
(svn r3445) - Fix: [ 1415379 ] Enhance documentation of lift destination
...
- Fix: wrong documentation of trees (Tron)
19 years ago
318fe153eb
(svn r3365) Staticise 36 functions
19 years ago
04c096ee63
(svn r3339) Remove unnecessary includes
19 years ago
80986fcd32
(svn r3282) - Codechange: Replace tests against CMD_ERROR with CmdFailed()
19 years ago
e901aefb74
(svn r3188) Use CmdFailed() to check, if a command failed, don't compare with CMD_ERROR
19 years ago
9d0e7b6458
(svn r3181) -Bracing
...
-Indentation
-Whitespace
-DeMorgan's Law
-Test with NULL or 0 for non-booleans
-'\0' instead of 0 for chars
-Remove redundantly redundant comments (like DoFoo(); // Do foo)
-Join multiple short lines with a single statement
-Split single lines with multiple statements
-Avoid assignments in if
19 years ago
6509e42db3
(svn r3179) - RandomRange() and RandomTile() instead of home brewed versions
...
- CHANCE*() instead of mumbling strange numbers
19 years ago
524fd25cbd
(svn r3177) GB, CLRBIT, HASBIT, TOGGLEBIT
19 years ago
81e5b16d71
(svn r3172) static, const
19 years ago
181d586a7c
(svn r3078) Some more stuff, which piled up:
...
- const, whitespace, indentation, bracing, GB/SB, pointless casts
- use the trinary operator where appropriate
- data types (uint[] -> AcceptedCargo, ...)
- if cascade -> switch
- if (ptr) -> if (ptr != NULL)
- DeMorgan's Law
- Fix some comments
- 0 -> '\0', change magic numbers to symbolic constants
19 years ago
0b936c3222
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
...
nothing spectacular, just some stuff, which piled up
19 years ago
71d293f2a3
(svn r3066) Constify the parameter of GetSlopeZ_*()
19 years ago
b17b87469c
(svn r3064) Replace some numbers by sprite names
19 years ago
8980891b09
(svn r3024) -Codechange: Another batch of replacements of int/uint/int16/byte/-1 with proper types and constants
19 years ago
39f5dbfd3b
(svn r3019) -Codechange: Replace explicit shifting/anding/oring with GB and SB
19 years ago
6d7c7e67b2
(svn r3010) Get rid of quite some dubious casts, either by using GB(), proper types or just removing them
19 years ago
90e33aed22
(svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate
19 years ago
4a58250cb9
(svn r2962) - const correctness for all Get* functions and most Draw* functions that don't change their pointer parameters
...
- change a lot of byte player types to PlayerID
- beautify header files, same "#endif /* filename */" ending
19 years ago
78e4cbbfda
(svn r2956) - Fix: [ 1253736 ] creating many town crash to desktop. Now it 'dies' with an ingame error message informing the gamer if it couldn't generate any towns in user-space. Still if it happens during new-game generation it crashes since we don't yet have actions to do in such a circumstance.
19 years ago
c0c75ef16e
(svn r2951) - Fix: [ 1259345 ] Changing engine in netgame opens train window for everyone
...
- Add IsLocalPlayer() which substitutes _local_player == _current_player
19 years ago
8b74a95d36
(svn r2886) Rename the "owner" attribute to "m1", because when it stores an owner it is accessed by [GS]etOwner anyway and when it doesn't store an owner, but arbitrary data, accessing a field called "owner" is confusing.
19 years ago
2f1d530bb5
(svn r2758) Add the AB() macro to add a value to a bit range and use it in a few places, also make use of GB and SB nearby
19 years ago
a3739aecdf
(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers
...
by enums. There remains work in gfx.c to move the "transparency" and
"recolor" bits around to make space for more sprites. However, 2800
additional sprites can now be loaded. There also remains cleanup and
Doxygen work on many of the header files.
19 years ago
647cbd6bdd
(svn r2701) Insert Id tags into all source files
19 years ago
54cbd01825
(svn r2673) Include functions.h directly, not globally via openttd.h
19 years ago
71140a5768
(svn r2669) Shuffle some more stuff around to reduce dependencies
19 years ago
6ad3895306
(svn r2660) Get rid of some more shifting/anding/casting
19 years ago
1fed0046ac
(svn r2658) -Codechange: Use MAKE_TRANSPARENT to display a transparented sprite
19 years ago
f09638ad3d
(svn r2650) Convert many explicit shifts+ands to extract bits to invocations of GB - should be a bit nicer to read
19 years ago
dc3ca73bd5
(svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way.
...
- The formatting of the industry name can be controlled with the string STR_INDUSTRY_FORMAT.
Change: Changed several occurences of {STRING1} into {TOWN} to get rid of townnametype being used directly.
19 years ago
31fd5b2768
(svn r2574) Fix: AnimatedTile leak in town_cmd.c (this one has probably been here since day 1)
19 years ago
ddc939f0ed
(svn r2570) Fix: Removed some code that had no effect.
19 years ago
2123deff13
(svn r2560) Fix: various minor code changes.
...
Added RandomTile/RandomTileSeed functions to generate a random tile.
Changed landscape routines so they don't assume that the Y map side is a power of two. (support for this is not complete, though)
Changed some frequently used map macros to not compute the values each time.
Silence some warnings on MSVC.
19 years ago
a4bf608d40
(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.
19 years ago
9617614b04
(svn r2487) Replace TILE_XY by TileXY/TileDiffXY
19 years ago
2b73dec567
(svn r2486) Turn TILE_FROM_XY into an inline function and rename it to TileVirtXY
19 years ago
a733fede9b
(svn r2483) Replace almost 500 "uint tile" (and variants) with "TileIndex tile"
19 years ago
354058341b
(svn r2468) -Codechange: Got rid of DEREF_PLAYER and replaced it by GetPlayer
19 years ago
aab5561c55
(svn r2434) Fix some defects in r2433
19 years ago
c37cf285ce
(svn r2433) - CodeChange: unmagicify all road/train crossings with IsLevelCrossing() function (peter1138)
19 years ago
ff0030936e
(svn r2408) Introduce SetTileOwner() and use it
19 years ago
a9b95b3cbb
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
19 years ago
ba8c649fac
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
19 years ago
f4f5cb93f8
(svn r2387) - CodeChange: made the saveload code more readable and also removed the 'byte' saveload arrays which means you can save an array of more than 255 elements, or bigger structs than 255 bytes. This doesn't yet solve the problem that a chunk can be a maximum of 16384 big.
...
- Fix: also fix an unnoticed error in SlSaveLoadConv() due to wrong types.
19 years ago
abc5fd1272
(svn r2345) - Fix: Don't allow stuff to be renamed to nothing if we don't support it. Only valid ones are signs (delete) and waypoints (rename to default).
19 years ago
4eebeff58c
(svn r2324) Introduce _cmd_text for passing strings with a command instead of abusing _decode_parameters as text buffer. This should prevent several possible buffer overruns and is a bit cleaner to use. As bonus it reduces the size of most command packets by 79 bytes.
19 years ago
562a32c3ee
(svn r2297) - CodeChange: server-check the next batch of commands.
...
- CodeChange: since only the server will be able to modify difficulty settings, leave the checking of correct values besides, and trust users will join legit servers.
- CodeChange: for renaming signs, only check if GetDParam(); eg _decode_parameters is empty ('\0') or not, instead of the extra check of players, etc. That basically does the same thing. Also dirty sign two times when renaming, once before, once after the action. Because if the name becomes shorter and you update only after, garbage remains on the screen.
- CodeChange: made GetMaskOfTownActions() available to the town-cmd to double-check if the action was available to the player. For this purpose the hardcoded _local_player has been removed from the function and is now passed as a parameter.
19 years ago
2aa7b2d7ea
(svn r2142) - Fix: Game no longer crashes when you want to remove a piece of road under a bridge that belongs to the town. TODO: railcrossings store owner somewhere else, put it into _map_owner[]!
20 years ago
00ff85dcb8
(svn r2033) - Fix: Fix some more desync by saving the town growth frequency iterator _cur_town_iter. Needed to bump a svg revision for that thanks to the braindead SlGlob thing, or at least I don't know how to do it without bumping it.
20 years ago
49f769948b
(svn r2021) Fix: Enlarge _cur_town_ctr from byte to uint32 so that all the towns are considered when growing them even for big maps, where much more than 256 towns are around; reported by Tomasz Dubiński <uboottd@hydra.polsl.gliwice.pl>. The savegame still saves just the lowest 8 bits but that doesn't hurt so much.
20 years ago
ef1325cd36
(svn r2004) - Fix: [ 1149487 ] Autosave ignoring settings
...
- Fix: [ 1153926 ] All my settings in vain... IGNORED!
- Change: I hope I got it all right. Pressing 'New Game' (either choosing random or a preset scenario) and 'Create Scenario' will start a new game with the settings and difficulty in the intro menu. Using 'Load Game' and 'Play Scenario' will take the values from the savegame/scenario itself.
20 years ago
5483b77865
(svn r1955) Fix: Make the town growth frequency scale properly both up and down. The scaling is now also based on the number of towns instead of the map size. (In cooperation with HackyKid.)
20 years ago
43fbe3b2da
(svn r1952) Fix: Hopefully fixed the enormous towns growth slowdown in large maps. (Inspired by toholio.)
20 years ago
7616f7c362
(svn r1925) Fixed an infinite loop if the town generator runs out of town names. The number of generated towns is then limited by the number of available names.
20 years ago
2eda5228d1
(svn r1881) -Fix: [ 1119308 ] Max passengers / mail variables are now 32 bit
20 years ago
563eac90ca
(svn r1866) -Fix: Intercepted generated maps with 0 towns on it. Currently just an
...
error() is called, some more graceful handling should be implemented
later.
20 years ago
7d56d1d841
(svn r1839) Move GetTileSlope() and GetTileZ() into tile.[ch] and use more explicit types as parameters
20 years ago
6984d6cd31
(svn r1832) Next byte -> char iteration: custom names
20 years ago
f1610872de
(svn r1831) -Fix: Scenario Editor now handles human-made roads better (try to build
...
a city layout before placing the city, finally that works very nice)
20 years ago
d3f84347ac
(svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c)
20 years ago
12183084b7
(svn r1808) Use strcmp() instead of home brewed function str_eq()
20 years ago
40323bbce2
(svn r1784) -Fix: removed ClosestTownFromTile where possible, or replaced it
...
with _map2-data if possible (Celestar / TrueLight)
20 years ago
2e357e69f9
(svn r1768) -Codechange: Store town index in _map2 of town tiles
...
Moved house type from _map2 to _map3_hi for MP_HOUSE
Moved foundation and roadworks from _map2 to _map3 for
MP_STREET
This increases game speed by a factor of around 15(!) if many cities are around.
Converting an old game is done automagically, but can take a while
20 years ago
bb05305a1f
(svn r1765) -Fix: on loading, the total amount of towns wasn't reset to zero
20 years ago
59ac6e8c4b
(svn r1764) -Add: dynamic towns, you can now have up to 64k towns (let me know when
...
you have that amount of towns in a map ;))
20 years ago
9ca00b845a
(svn r1756) Cleanup: if cascade -> switch, uint -> TileIndex
20 years ago
bb680056b1
(svn r1749) Move the functions which calculate distances to map.[ch] and give the more meaningful names
20 years ago
39858e696b
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
20 years ago
400f07fdb8
(svn r1706) Implement ScaleByMapSize() and ScaleByMapSize1D()
...
These scale a number relative to the map size/circumference.
Use them to scale the amount of map objects.
Of course at the moment they return just the input, because there are no bigger/smaller maps yet.
20 years ago
07cb3068ae
(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
...
WARNING: If i made any mistake here it WILL lead to corrupted savegames!
20 years ago
94d5aeabb2
(svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile
20 years ago
07a10a51a7
(svn r1581) Added a display for the total map population to the town display (Jango)
20 years ago
ca8eb44828
(svn r1542) Rename TileHeight to TilePixelHeight, because this is what it actually returns
20 years ago
61a6bc544d
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
20 years ago
957635121c
(svn r1504) enummed town ratings (Jango)
20 years ago
414ac3286b
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
20 years ago
b450603437
(svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries
...
(in prepare of dynamic arrays):
- DEREF_XXX is changed into GetXXX
- All direct call are directed via GetXXX
- struct Industry has now an index-field
- ENUM'd some stuff
- Replaced home built loops with FOR_ALL_XXX
- Added _stations_size, _vehicles_size, ... which gives the length of the
array (which will be dynamic in the near future)
- Changed lengtof(XXX) to _XXX_size (e.g. _stations_size)
- Removed all endof(XXX) (because mostly it was part of a FOR_ALL_XXX)
- Made the sort-functions of all 4 dynamic
- Made all 4 Initialize functions more of the same
- Some minor tab-fixing and stuff
(tnx to Tron for proof-reading my 100kb patch ;))
Note for all: please do NOT directly call _stations, _vehicles, _towns and
_industries, but use the right wrapper to access them. Thank you.
Ps: please also do not use 'v++', where v is of type Vehicle *.
20 years ago
d3c6855320
(svn r1396) Introduce TileIndexDiffC - the compile time version of TileIndexDiff
20 years ago
e4cf2ba1b3
(svn r1386) Move TileIndexDiff to map.h
...
Move _tileoffs_by_dir to map.[ch] and encapsulate it in TileOffsByDir()
20 years ago
bcff0ab932
(svn r1344) Use MapSize[XY]() (or MapSize()/MapMax[XY]() where appropriate) instead of TILES_[XY]
20 years ago
75567c3d7d
(svn r1313) -Fix: fixed MSVC problem
20 years ago
c748f6db57
(svn r1312) -Add: Patch which is on by default: population in label of the town
...
-Fix: Expand town is a bit more agressive
-Fix: Fixed a bug in growing algorithm
20 years ago
fe657e9ee3
(svn r1301) -Codechange: _industries finally has FOR_ALL_INDUSTRIES too
20 years ago
2f9e0b8e0c
(svn r1288) -Codechange: changed _map2 to an uint16. It is still saved and loaded as
...
an uint8 till the savegame version is bumped to version 5. Then it works
automaticly as a fully uint16. So _stations[] can not be increased till
after the bump!!
20 years ago
a148ff4e0d
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
20 years ago
d6a1f3e412
(svn r942) -Merged branch/network back into the trunk
20 years ago
265ac67183
(svn r901) Small step in the process to clean up the DPARAM mess:
...
- reduce to 2 sizes (*DParam64 for 64bit values, *DParam for the rest)
- use inline functions instead of macros
- add assert()s to check for buffer overruns
20 years ago
97c533eb9c
(svn r831) Remove station-specific roadbits magic. Tron already fixed road stations so that they don't give out roadbits in r780.
20 years ago
0554031514
(svn r830) Move the MP_STATION roadbits guard to GetTownRoadBitsByTile() wrapper of GetRoadBitsByTile(). This should really and for once fix the road-behind-road-station bug.
20 years ago
acbd1801c7
(svn r815) Include strings.h only in the files which need it.
...
This should reduce the compile time after altering english.txt by about 1/3, because "only" 62 instead of 90 .c files must be recompiled.
20 years ago
e8537f5512
(svn r787) Invert the sense of the DO_TRANS_BUILDINGS flag to be consistent with its own name and all other DO_* flags.
...
Now it is active-true.
20 years ago
d51887fbed
(svn r764) Enumerate the houses only one per town can exist and use the enums instead of magic numbers to check for these
20 years ago
8a3d7cce1c
(svn r760) Replace some bit-juggling with bit fields
20 years ago
40a04816a4
(svn r756) Demystify and explain some piece of code regarding which house sprite to draw
20 years ago
57adc97733
(svn r724) Remove restriction that a tile can only accept 3 cargo types.
...
This especially enables houses to accept passengers, mail, goods AND food.
Add string templates for up to 5 cargo types for the tile info window. If more are needed just add them.
Simplify (de-uglify) the logic for cargo acceptence for houses and split the goods/food table into two. The acceptance is unmodified, but accepting goods AND food is now trivially possible. The exact amounts have to be decided.
This is based on Celestar's changes in the map branch plus some further bits that will be merged there soon.
20 years ago
tron
Darkvater
peter1138
celestar
ludde
pasky
truelight