Commit Graph

169 Commits

Author SHA1 Message Date
tron
a2362674e3 (svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc. 2006-06-10 08:37:41 +00:00
KUDr
f2da689343 (svn r5170) - CodeChange: corrected name for "road_crossing_penalty" (mistake in previous commit) 2006-06-08 17:36:06 +00:00
KUDr
7b4c46e388 (svn r5169) - CodeChange: [YAPF] RVs now use YAPF_TILE_LENGTH as base unit and 2 configurable settings (slope and crossing penalties) for cost calculation 2006-06-08 17:31:03 +00:00
KUDr
ba86269c65 (svn r5164) - CodeChange: [YAPF] settings of platform penalties are now saved only in network savegames (thanks glx) 2006-06-07 21:26:57 +00:00
tron
020721565a (svn r5136) Fix various style bugs:
- Trailing whitespace
- Trailing empty lines
- Missing newline at EOF
- Missing svn:eol-style native
2006-06-05 18:10:43 +00:00
KUDr
ba25c1e222 (svn r5076) CodeChange: [YAPF] Platform selection feature related settings added into regular savegames (breaks savegame compatibility only with r5070 and 5071). 2006-06-02 16:31:35 +00:00
KUDr
7e6d84a34e (svn r5067) -Codechange: [YAPF] Platform selection feature now applies penalty per platform instead of per tile (should give better results) 2006-06-01 22:20:40 +00:00
KUDr
10185f6c11 (svn r5066) -Feature: [YAPF] Train selects the best station platform by length 2006-06-01 21:39:35 +00:00
KUDr
308f27a3de (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing. 2006-05-27 16:12:16 +00:00
KUDr
a5f6677b20 (svn r4916) - Fix: SLE_BOOL replaced by SLE_UINT8 for byte _network_lan_internet 2006-05-19 20:32:45 +00:00
celestar
d76279144d (svn r4639) -Feature: Turkish town names (jnmbk) 2006-05-01 09:25:23 +00:00
Darkvater
52d790f8e2 (svn r4531) - Fix [NewGRF]: overzealous fixing, reset num_params to 0 from -1 when parsing the parameter list fails. 2006-04-22 14:06:46 +00:00
Darkvater
ae828f869a (svn r4530) - Fix [NewGRF]: don't spew a warning when a grf file has no parameters. 2006-04-22 13:59:21 +00:00
Darkvater
fe61e68c8a (svn r4527) - Feature [NewGRF]: Add support for specifying parameters to GRF files. Usage: "mygrf = 1". You can pass up to 128 parameters, each one seperated by a comma or a space-character. Big thanks to peter1138 for the inspiration and examples. 2006-04-22 13:17:13 +00:00
Darkvater
28a046116e (svn r4512) - Codechange: Sprinkle some doxygen magic over settings.c 2006-04-22 00:10:38 +00:00
peter1138
7f65f09ea6 (svn r4498) - Use an item's name instead of value when parsing configuration lists. 2006-04-21 09:18:39 +00:00
Darkvater
09fab9483c (svn r4491) - Codechange: handle IGT_LIST types just as the other types with a proper name and value setting (for example for newgrf parameters). 2006-04-20 22:09:49 +00:00
Darkvater
983892e886 (svn r4490) - Feature: The integer-list parser now accepts a space character as an item seperator next to the comma. 2006-04-20 22:09:12 +00:00
Darkvater
f9c99a809b (svn r4489) - Codechange: some small cleanups in the settings-parser code, mainly substituting terminating 0 characters with '\0'. 2006-04-20 22:08:20 +00:00
peter1138
28eec97d8f (svn r4487) - Codechange: replace the custom currency magic number 23 with a define 2006-04-20 21:13:08 +00:00
bjarni
e1a688df75 (svn r4445) -Fix: FS#108 Danish name generator bug
this was actually not a bug in the generator, but rather it saved/loaded the setting danish as swiss (the previous in the list)
2006-04-16 10:26:46 +00:00
tron
35e93e451f (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex
Remove DoCommandByTile(), because now it does the same as DoCommand()
2006-04-10 07:15:58 +00:00
celestar
969328d8c1 (svn r4153) -Codechange. Changed NPF_TILE_LENGTH into an enum and moved it out of variables.h. Just a drop in the bucket, but it is a start 2006-03-29 19:00:56 +00:00
Darkvater
16ffb03d25 (svn r4142) - Fix [FS#74]: Incorrectly loaded settings from the config file when the signed uint32 variable would be negative. 2006-03-28 21:51:14 +00:00
peter1138
67bc818bbe (svn r4126) - Feature: A new multi-lingual multi-measuring-unit system:
- Replace miles/kilometres game option with a general measuring units option.
  - Add {POWER}, {WEIGHT}, {WEIGHT_S} and {VOLUME_S} (_S for short) tags to the language/string system.
  - Add SI as option for measuring units.
  Language file updates to use the system will come soon.
2006-03-26 21:50:57 +00:00
Darkvater
231d829253 (svn r3997) - Default the patch-setting 'pause_on_join' to true. 2006-03-21 21:07:50 +00:00
Darkvater
40e49f25d6 (svn r3930) - [Patches] Change the GUI-patch options from indeces to string representations. Not only makes this the part more humanly readable, but saves us from rewriting the whole index when a patch is added/removed/changed 2006-03-17 22:47:52 +00:00
Darkvater
5ad5d86347 (svn r3926) - [Patches]: Switched string for ship and aircraft replacement, and also forgot to put back the callback function. Thanks Tron 2006-03-17 20:56:51 +00:00
Darkvater
28b9523053 (svn r3924) - Revert r3923, apparently we are not fond of CONDNULL() structs :) 2006-03-17 19:52:12 +00:00
Darkvater
99d8636902 (svn r3923) - [Pathces/HACK]: Add 32 empty bytes at the end of the patches chunk in the savegame to not to have to increase the savegame version every time we add one; at least for a while. To not break in-between nightlies a temporary hack is done. So make sure to upgrade to this nightly before you upgrade to newer ones. Releases are unaffected 2006-03-17 18:54:42 +00:00
Darkvater
e1abce7082 (svn r3915) - Savegame version 23: Do not save the autosave interval anymore with savegames. Some people should be very happe atm ;) 2006-03-17 08:06:56 +00:00
Darkvater
9b3f41df3b (svn r3914) - Properly implement SDT(G)_CONDNULL macro's without special cases (add flag SLF_CONFIG_NO and empty string as name) 2006-03-17 08:01:54 +00:00
Darkvater
73561f76cd (svn r3896) - [Patches] Fix: Honour any conditional settings when retrieving the setting entries. 2006-03-16 00:22:36 +00:00
Darkvater
650b1b0c93 (svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used
- Also add this capability to settings
2006-03-16 00:20:33 +00:00
Darkvater
63a181f396 (svn r3880) - just do a string compare without length restrictions; followup for r3875 2006-03-15 12:37:59 +00:00
Darkvater
19dee66a26 (svn r3875) - [Patches] Fix up the intro menu so the right values for the mapsize are shown (the default ones). Setting the value involves a small hack in that we also set the _patches value because that is used for world-generation and only inside there do the values get copied from _newgame
- [Patches] Fix a stupid, stupid bug where I used sizeof() as length instead of strlen() in getting console values for patches.
2006-03-14 22:58:46 +00:00
Darkvater
d56eb82ab5 (svn r3854) - Fix restart_game_date to default to zero and allow a value of 0 which got screwed up during the patch-rewrite. Thanks peter1138 2006-03-13 23:20:24 +00:00
Darkvater
d4479fc1a2 (svn r3852) - Revert r3733 which fixed the default value loading for char, but broke loading a set value. Added a better fix which needs a char value to be a string (eg enclosed in double-quotes) 2006-03-13 23:10:02 +00:00
peter1138
995a4572ec (svn r3775) Fix loading of server_port from config file, introduced in Darkvater's unified configuration changes (r3719+) 2006-03-06 19:23:26 +00:00
Darkvater
eeb2b7cd11 (svn r3746) - [7/7] Moving the callback functions for the setting-changes from settings_gui.c to settings.c. Also enable the callback functionality through the console.
- Fix a nasty bug with improper counter addition. (*i)++ and NOT *i++ when setting a patch value through the console.
2006-03-03 11:27:18 +00:00
tron
8cf4fe9cdf (svn r3733) Fix a bug in r3719, which caused a crash when the default value for a SLE_VAR_CHAR setting was used 2006-03-02 14:45:35 +00:00
Darkvater
d1a6223365 (svn r3732) - Fix two warnings. Stupid MSVC didn't even complain :s (Thank Tron and peter1138)
- NOTE! There are a few warnings left in settings_gui because tha callback functions are disabled. I still need a good place for them.
2006-03-02 09:57:28 +00:00
Darkvater
40405368d5 (svn r3726) - [6/6] Finalize conversion, finally save the patches struct.
- Remove the temporary synchronisation in during the map-transfer as this is no longer needed
- The saved patches work just like the saved gameoptions. You have a _patches and a _patches_newgame struct. The _patches_newgame struct contains the values from the configuration file and thus the defaults for new games. When a new game is started or an older game is loaded, the default values are copied over to _patches to be used. When you load a game that has PATS saved, the default values are also loaded, but immediately overwritten by the values from the savegame. This ensures that player-based values are always taken from your personal preferences.
- The current implementation also changes the default values if you change player-based settings in the game. For example changing window_snap_radius in a certain game will also change it for all next OpenTTD sessions.
- The savegame version has been increased to 22.
- The last 6 orso patches close the following reports:
  [ 1366446 ] different names for patches: all patch settings have the same name as in the configuration file and are reachable from the console.
  [ 1288024 ] Strange string on OTTD initial screen: configuration (and this includes patches) inputs are validated and clamped to their minimum/maximum values.
  [ 1423198 ] Make "Signals on Drive side" player, not server, based: this is only visual so current setting is to save it with the savegame but not synchronise in multiplayer.
  [ 1208070 ] Patches and New GRF options saved: apart from newgrf this is done
2006-03-02 02:22:15 +00:00
Darkvater
12948b995b (svn r3723) - [5/6] Move over the console commands from settings_gui to settings where they rather belong.
- Remove the restriction that the 'patch' console command can only be run from network games.
2006-03-02 01:56:25 +00:00
Darkvater
2269685c23 (svn r3722) - [4/4] Present the game with a unified structure for the configuration-ini, saveload, console and gui representations of the settings. The last part finishes the transition with the merging of the settings_gui table(s).
- Because patches are (will be in a few commits) saved, you cannot specify the order of the GUI-items in the SettingDesc tables themselves. Doing so would mean messing around with the savegame-version, or doing expensive lookups. So the GUI-tables are now just simple indeces into the original table. No more is needed since that table contains all information
- The only change in functionality is that the stepsize has been automated. It is calculated from the minimum and maximum values such that within 50 clicks you will have gone from one end to the other if scrolling.
- The GUI has kept its flags intact. These are:
  SGF_0ISDISABLED: the variable might have a domain higher than zero, but a special value of nul is used as telling that feature is disabled.
  SGF_NOCOMMA: represent the number without any thousand-seperators
  SGF_MULTISTRING: internally the variable is a number, but its representation is a string based on a simple offset.
  SGF_NETWORK_ONLY: this setting can only be changed during network games
  SGF_CURRENCY: the variable represents money and will be shown in the local currency
- - NOTE! The game is not compilable after this commit (because console hooks have not been updated)
2006-03-02 01:41:25 +00:00
Darkvater
a9d33943d7 (svn r3721) - [3/4] Present the game with a unified structure for the configuration-ini, saveload, console and gui representations of the settings. From part 3 on, OpenTTD is once again compilable.
- Code has been added to the saveload code to honour the SLF_SAVE_NO and SLF_NETWORK_NO flags. SLF_NETWORK_NO just reads in the the bytestream and then discards it because that setting is not synchronised. For this the function SlSkipBytes() has been reinstated
- SAVEGAME_VERSION has been changed from a constant ENUM to a constant integer. This was done for the configuration-code to be able to tell which version of a CONDVAR type to handle. As said before, because settings can be saved to the savegame, they will become conditional at some point. The configuration code always has to read the 'most recent' version.
- GameOptions are saved through the new structure. It is fully compatible with any old savegame...however it is better. Because of the move to this new format we can instruct the loader to skip certain variables. Autosave for example isn't synchronised anymore (in the network). The same goes for currency and kilometers :D. That is the only functionality change this patch is supposed to have if I have written it correctly.
- NOTE! Patches are still not saved so for Multiplayer to work network_client.c and network_server.c needed slight modifications.
2006-03-02 00:32:48 +00:00
Darkvater
85e0d9c967 (svn r3720) - [2/4] Present the game with a unified structure for the configuration-ini, saveload, console and gui representations of the settings. This second part gets rid of the old SettingDesc structures and updates them with the unified types. These new settings are heavily macro'd, which should make it easy to add/edit entries within sections.
- This unified structure merges the settings in settings.c (concerned with the ini file) and the ones in setting_gui., having to do with the GUI. I tried to give sensible min and maximum values to _patches that were not present in the GUI I hope they work out all right.
- All patch settings miss their callback function which have been temporarily reset to NULL
- Fixed a really small typo in a Doxygen comment in settings.h
- NOTE! When for example _patches are saved to the savegame (as are _gameopt_settings now), you cannot just blindly edit the struct. The same rules apply as to all the other SaveLoad structs. Eg correct CONDVAR's and only adding new entries at the end.
- NOTE! The game is not compilable after this commit.
2006-03-02 00:07:41 +00:00
Darkvater
f5b51b1cb9 (svn r3719) - [1/4] Present the game with a unified structure for the configuration-ini, saveload, console and gui representations of the settings. This first part rewrites the configuration section to use the SaveLoad VarType in general.
- This unified structure consists of a SaveLoad type which stores all data relevant about the variable internals such as type, mem/filesize, address, version-control. The SettingDesc type is concerned more about the representation. Things like default value, string-name, minimum/maximum values, gui-behaviour etc.
- The SaveLoad type has received a few flags controlling saving/loading. These are:
  SLF_SAVE_NO: the setting is not saved with the savegame, effectively making this setting player-based. Eg. it will NOT be overwritten when joining a network-game
  SLF_CONFIG_NO: the setting is not saved to the configuration file so you cannot overwrite it ingame.
  SLF_NETWORK_NO: the setting is not synchronised with the local settings when the game is loaded during network-play. Note that when SLF_SAVE_NO is set, SLF_NETWORK_NO is also set (which is logical), at least if the proper macros are used (in [2/4]).
- NOTE! The game is not compilable after this commit.
2006-03-01 23:53:20 +00:00
Darkvater
e8cf6ec8fd (svn r3716) - Move the option settings (_game_opt_desc) from misc.c into settings.c. This will be merged with SettingDesc misc_settings above as they are actually the same. No functionality has changed beside the fact that the settings are now in a different Chunkhandler. 2006-03-01 21:15:25 +00:00
Darkvater
83957ac5ad (svn r3641) - Rename MusicFilesettings 'btn_down' to more sensible 'playing' 2006-02-20 23:40:53 +00:00