------------------------------------------------------------------------ r3733 | tron | 2006-03-02 14:45:35 +0000 (Thu, 02 Mar 2006) | 1 line Fix a bug in r3719, which caused a crash when the default value for a SLE_VAR_CHAR setting was used ------------------------------------------------------------------------ r3732 | Darkvater | 2006-03-02 09:57:28 +0000 (Thu, 02 Mar 2006) | 2 lines - 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. ------------------------------------------------------------------------ r3730 | celestar | 2006-03-02 08:55:12 +0000 (Thu, 02 Mar 2006) | 10 lines Multistop modifications: -Codechange: Completely rewritten the slot assignment system. It now consumes less CPU cycles and memory -Codechange: Increased maximum number of roadstops to 16. -Fix: Several conditions where a slot becomes unliked from a vehicle -Codechange: ClearSlot now only takes one parameter, the vehicle -Feature: Console command 'clearslots' to clear ALL currently assinged slots. debug usage only -Feature: vehicles that cannot get a slot now wait on the road instead of planlessly blocking stops or circling around -Codechange: Adjusted debug levels TODO: Make the slot finder compatible with (a) pathfinder(s). ------------------------------------------------------------------------ r3727 | Darkvater | 2006-03-02 02:30:15 +0000 (Thu, 02 Mar 2006) | 1 line - Fix some typos in the readme and known-bugs text files ------------------------------------------------------------------------ r3726 | Darkvater | 2006-03-02 02:22:15 +0000 (Thu, 02 Mar 2006) | 10 lines - [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 ------------------------------------------------------------------------ r3724 | Darkvater | 2006-03-02 02:03:21 +0000 (Thu, 02 Mar 2006) | 1 line - [5.5/6] heh, the patch part got left out of the previous commit, sorry ------------------------------------------------------------------------ r3723 | Darkvater | 2006-03-02 01:56:25 +0000 (Thu, 02 Mar 2006) | 2 lines - [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. ------------------------------------------------------------------------ r3722 | Darkvater | 2006-03-02 01:41:25 +0000 (Thu, 02 Mar 2006) | 10 lines - [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) ------------------------------------------------------------------------ r3721 | Darkvater | 2006-03-02 00:32:48 +0000 (Thu, 02 Mar 2006) | 5 lines - [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. ------------------------------------------------------------------------ r3720 | Darkvater | 2006-03-02 00:07:41 +0000 (Thu, 02 Mar 2006) | 7 lines - [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. ------------------------------------------------------------------------ r3719 | Darkvater | 2006-03-01 23:53:20 +0000 (Wed, 01 Mar 2006) | 7 lines - [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. ------------------------------------------------------------------------ r3718 | Darkvater | 2006-03-01 23:39:21 +0000 (Wed, 01 Mar 2006) | 1 line - Add proper Doxygen comments to some saveload-structs (using ///<) ------------------------------------------------------------------------ r3717 | peter1138 | 2006-03-01 23:14:03 +0000 (Wed, 01 Mar 2006) | 2 lines - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour. ------------------------------------------------------------------------ r3716 | Darkvater | 2006-03-01 21:15:25 +0000 (Wed, 01 Mar 2006) | 1 line - 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. ------------------------------------------------------------------------ r3714 | tron | 2006-03-01 21:00:44 +0000 (Wed, 01 Mar 2006) | 1 line Add functions to turn tiles into water and shore tiles ------------------------------------------------------------------------ r3713 | Darkvater | 2006-03-01 20:49:47 +0000 (Wed, 01 Mar 2006) | 4 lines - Fix up the cheats window a little. The cheats code is still abominable, but at least a bit more readable now. Use the now generalized ReadValue/WriteValue functions as well as using general variable-types (SLE_VAR, instead of custom CE_ ones). Remove the CE_CLICK type and use a SLE_BOOL type instead with a flag of CE_CLICK. Remove stepsize from the struct. The stepsize is automatically calculated from the minimum and maximum values (in 20 steps). ------------------------------------------------------------------------ r3712 | Darkvater | 2006-03-01 20:38:39 +0000 (Wed, 01 Mar 2006) | 1 line - Change the boolean assignment/reading from == 1 to != 0 as suggested by Tron. ------------------------------------------------------------------------ r3711 | Darkvater | 2006-03-01 20:34:51 +0000 (Wed, 01 Mar 2006) | 1 line - Extract the WriteValue() and ReadValue() parts of the saveload code to assign/read to/from a variable. Preparatory work to make this the general function type for such assignments ------------------------------------------------------------------------ r3710 | Darkvater | 2006-03-01 20:24:22 +0000 (Wed, 01 Mar 2006) | 1 line - Use the general function DrawArrowButtons() instead of doing it manually. The function has two parameters added, colour and an enabled flag. ------------------------------------------------------------------------ r3707 | bjarni | 2006-03-01 19:20:35 +0000 (Wed, 01 Mar 2006) | 3 lines -Fix: made the generated Finnish town names sound more Finnish (ln-) note: Bjarni: please go ahead and commit it, i'll take the responsibility if something should go wrong. ------------------------------------------------------------------------ r3701 | peter1138 | 2006-03-01 17:35:01 +0000 (Wed, 01 Mar 2006) | 2 lines [2cc] move vehicle/engine palette functions out of header file and document the remaining definitions ------------------------------------------------------------------------ r3699 | tron | 2006-03-01 15:03:47 +0000 (Wed, 01 Mar 2006) | 1 line Replace some magic numbers for checking for a suitable slope for a level crossing by some less magic numbers ------------------------------------------------------------------------ r3698 | tron | 2006-03-01 12:31:39 +0000 (Wed, 01 Mar 2006) | 1 line Add GetCrossingRailBits() and ComplementRoadBits(). Simplify the code by using them ------------------------------------------------------------------------ r3697 | tron | 2006-03-01 09:40:34 +0000 (Wed, 01 Mar 2006) | 1 line Rename DIAG1/DIAG2 to X resp. Y as this conveys a bit better in which direction a pieces of rail goes ------------------------------------------------------------------------ r3696 | tron | 2006-03-01 08:56:38 +0000 (Wed, 01 Mar 2006) | 1 line Add functions to turn a tile into a normal rail tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring ------------------------------------------------------------------------ r3695 | tron | 2006-03-01 06:39:04 +0000 (Wed, 01 Mar 2006) | 2 lines Add 2 MarkTileByTile() which I forgot in r3689 (noticed by Belugas) ------------------------------------------------------------------------ r3689 | tron | 2006-02-28 21:19:50 +0000 (Tue, 28 Feb 2006) | 1 line Add functions to turn a tile into either a normal road tile, a level crossing or a road depot ------------------------------------------------------------------------ r3687 | tron | 2006-02-28 13:18:14 +0000 (Tue, 28 Feb 2006) | 2 lines Complete some bits I missed whenn adding accessor functions for road types and pieces ------------------------------------------------------------------------ r3686 | tron | 2006-02-28 11:49:12 +0000 (Tue, 28 Feb 2006) | 3 lines Dispel some strange magic regarding level crossings and foundations: if a level crossing is on a sloped tile, it has to be on a level foundation ------------------------------------------------------------------------ r3685 | peter1138 | 2006-02-28 08:16:00 +0000 (Tue, 28 Feb 2006) | 1 line Include a file missed from r3684... ------------------------------------------------------------------------ r3684 | peter1138 | 2006-02-28 08:13:15 +0000 (Tue, 28 Feb 2006) | 1 line - NewGRF: Support loading of miscellaneous flags (not used yet) ------------------------------------------------------------------------ r3683 | tron | 2006-02-28 06:14:42 +0000 (Tue, 28 Feb 2006) | 1 line Get rid of another FindLandscapeHeight() ------------------------------------------------------------------------ r3682 | bjarni | 2006-02-27 19:49:53 +0000 (Mon, 27 Feb 2006) | 1 line -Fix: didn't write $ correct in G5_detector in r3673, which caused problems for tortoisesvn ------------------------------------------------------------------------ r3681 | peter1138 | 2006-02-27 19:43:19 +0000 (Mon, 27 Feb 2006) | 1 line - [Multistop] Check the RoadStop type before check its status. This fixes an assert introduced in r3663. Also fix the return type of GetRoadStopType(). ------------------------------------------------------------------------ r3680 | tron | 2006-02-27 17:24:31 +0000 (Mon, 27 Feb 2006) | 3 lines Fix some magic numbers which got damaged in r1768 -Fix: Correctly restore the roadside after roadworks are finished ------------------------------------------------------------------------ r3679 | bjarni | 2006-02-27 16:58:26 +0000 (Mon, 27 Feb 2006) | 1 line -Fix: [OSX] fixed warning introduced in r3670 about permission denied in G5_detector.c when compiling without having Makefile.config ------------------------------------------------------------------------ r3678 | peter1138 | 2006-02-27 15:35:22 +0000 (Mon, 27 Feb 2006) | 2 lines - NewGRF Codechange: remove redundant braces and temporary variables. ------------------------------------------------------------------------ r3677 | tron | 2006-02-27 08:08:10 +0000 (Mon, 27 Feb 2006) | 3 lines Remove the FindLandscapeHeightByTile()s from the default AI. The corresponding TileInfos look like global variables at the first glance, but always get written to before reading in each function they are used in. ------------------------------------------------------------------------ r3676 | bjarni | 2006-02-26 19:02:09 +0000 (Sun, 26 Feb 2006) | 4 lines -Change: [OSX] changed info about package to how to install the game the package is long gone and people don't read a doc about a missing package when they don't expect to find one the doc is called install even though it's not a real install and have nothing to do with make install. People just read it the first time they see it when it's called install ;) ------------------------------------------------------------------------ r3675 | bjarni | 2006-02-25 22:03:30 +0000 (Sat, 25 Feb 2006) | 2 lines -Fix: [OSX] made the default gcc names for building universal binaries into the newest gcc for each target instead of hardcoding it for 4.0.0 ------------------------------------------------------------------------ r3674 | bjarni | 2006-02-25 21:25:23 +0000 (Sat, 25 Feb 2006) | 4 lines -Feature: [OSX] Added support for tripple binaries (binaries optimised for G3, G5 and i686) G4 have no problems using G3 code while G5 can, but really benefit from getting their own optimised code (Apple: G5 is not just a fast G4) Also changed FAT_BINARY to UNIVERSAL_BINARY since Apple removed most (all?) references to fat binaries on their homepage two days after I added FAT_BINARY ------------------------------------------------------------------------ r3673 | bjarni | 2006-02-25 18:11:11 +0000 (Sat, 25 Feb 2006) | 3 lines -Codechange: [OSX] changed the makefile to autodetect if it compiles on G5 and then adds flags to optimise for G5 This will not interfere with crosscompiling or universal binaries ------------------------------------------------------------------------ r3672 | bjarni | 2006-02-25 16:57:17 +0000 (Sat, 25 Feb 2006) | 2 lines -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed ------------------------------------------------------------------------ r3671 | bjarni | 2006-02-24 22:12:11 +0000 (Fri, 24 Feb 2006) | 2 lines -Code cleanup: fixed style and removed commented out code in video/cocoa_v.m ------------------------------------------------------------------------ r3670 | bjarni | 2006-02-24 22:05:20 +0000 (Fri, 24 Feb 2006) | 6 lines -Codechange: [OSX] rewrote a part of the cocoa video driver to speed it up by 1000% in fullscreen rewrote QZ_DrawScreen to only redraw dirty rectangles (instead of everything) This reduce the OpenTTD time spent on this function from 75% to 6,7% (in main menu) Note: window mode is unaffected by this commit Note: the mouse pointer can now leave artefacts in debug mode ------------------------------------------------------------------------ r3669 | tron | 2006-02-24 20:52:32 +0000 (Fri, 24 Feb 2006) | 4 lines Really wipe all data when making a void tile Thanks to Belugas, egladil and Rubidium for their inspiration and hard work, which all this stuff is based on ------------------------------------------------------------------------ r3668 | tron | 2006-02-24 20:38:08 +0000 (Fri, 24 Feb 2006) | 1 line Add a function to turn a tile into a tree tile ------------------------------------------------------------------------ r3667 | tron | 2006-02-24 20:35:37 +0000 (Fri, 24 Feb 2006) | 1 line Fix the cause of an assertion I triggered in r3665 ------------------------------------------------------------------------ r3666 | peter1138 | 2006-02-24 20:09:50 +0000 (Fri, 24 Feb 2006) | 2 lines Fix up svn properties and add header files to Windows project files. ------------------------------------------------------------------------ r3665 | tron | 2006-02-24 19:56:24 +0000 (Fri, 24 Feb 2006) | 1 line Add a function to turn a tile into a clear tile ------------------------------------------------------------------------ r3664 | tron | 2006-02-24 19:52:26 +0000 (Fri, 24 Feb 2006) | 1 line Add a function to turn a tile into a void tile ------------------------------------------------------------------------ r3663 | peter1138 | 2006-02-24 17:52:07 +0000 (Fri, 24 Feb 2006) | 2 lines - Fix: [Multistop] Check the status of the destination road stop instead of a station's first road stop. This only has effect with road vehicle queuing disabled. ------------------------------------------------------------------------ r3662 | Darkvater | 2006-02-23 20:53:30 +0000 (Thu, 23 Feb 2006) | 1 line Fix regression FS#58 with union, endiannes and static decleration problems. Removed the union. ------------------------------------------------------------------------