summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-03-02(svn r3723) - [5/6] Move over the console commands from settings_gui to ↵Darkvater
settings where they rather belong. - Remove the restriction that the 'patch' console command can only be run from network games.
2006-03-02(svn r3722) - [4/4] Present the game with a unified structure for the ↵Darkvater
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(svn r3721) - [3/4] Present the game with a unified structure for the ↵Darkvater
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(svn r3720) - [2/4] Present the game with a unified structure for the ↵Darkvater
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-01(svn r3719) - [1/4] Present the game with a unified structure for the ↵Darkvater
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(svn r3718) - Add proper Doxygen comments to some saveload-structs (using ///<)Darkvater
2006-03-01(svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring ↵peter1138
them. Currently the second colour is fixed to be the player's colour.
2006-03-01(svn r3716) - Move the option settings (_game_opt_desc) from misc.c into ↵Darkvater
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(svn r3714) Add functions to turn tiles into water and shore tilestron
2006-03-01(svn r3713) - Fix up the cheats window a little. The cheats code is still ↵Darkvater
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).
2006-03-01(svn r3712) - Change the boolean assignment/reading from == 1 to != 0 as ↵Darkvater
suggested by Tron.
2006-03-01(svn r3711) - Extract the WriteValue() and ReadValue() parts of the saveload ↵Darkvater
code to assign/read to/from a variable. Preparatory work to make this the general function type for such assignments
2006-03-01(svn r3710) - Use the general function DrawArrowButtons() instead of doing ↵Darkvater
it manually. The function has two parameters added, colour and an enabled flag.
2006-03-01(svn r3707) -Fix: made the generated Finnish town names sound more Finnish (ln-)bjarni
note: <ln-> Bjarni: please go ahead and commit it, i'll take the responsibility if something should go wrong.
2006-03-01(svn r3701) [2cc] move vehicle/engine palette functions out of header file ↵peter1138
and document the remaining definitions
2006-03-01(svn r3699) Replace some magic numbers for checking for a suitable slope for ↵tron
a level crossing by some less magic numbers
2006-03-01(svn r3698) Add GetCrossingRailBits() and ComplementRoadBits(). Simplify the ↵tron
code by using them
2006-03-01(svn r3697) Rename DIAG1/DIAG2 to X resp. Y as this conveys a bit better in ↵tron
which direction a pieces of rail goes
2006-03-01(svn r3696) Add functions to turn a tile into a normal rail ↵tron
tile/depot/waypoint. This is just a tiny step, the rail code needs way more love and caring
2006-03-01(svn r3695) Add 2 MarkTileByTile() which I forgot in r3689 (noticed by Belugas)tron
2006-02-28(svn r3689) Add functions to turn a tile into either a normal road tile, a ↵tron
level crossing or a road depot
2006-02-28(svn r3687) Complete some bits I missed whenn adding accessor functions for ↵tron
road types and pieces
2006-02-28(svn r3686) Dispel some strange magic regarding level crossings and foundations:tron
if a level crossing is on a sloped tile, it has to be on a level foundation
2006-02-28(svn r3685) Include a file missed from r3684...peter1138
2006-02-28(svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet)peter1138
2006-02-28(svn r3683) Get rid of another FindLandscapeHeight()tron
2006-02-27(svn r3682) -Fix: didn't write $ correct in G5_detector in r3673, which ↵bjarni
caused problems for tortoisesvn
2006-02-27(svn r3681) - [Multistop] Check the RoadStop type before check its status. ↵peter1138
This fixes an assert introduced in r3663. Also fix the return type of GetRoadStopType().
2006-02-27(svn r3680) Fix some magic numbers which got damaged in r1768tron
-Fix: Correctly restore the roadside after roadworks are finished
2006-02-27(svn r3679) -Fix: [OSX] fixed warning introduced in r3670 about permission ↵bjarni
denied in G5_detector.c when compiling without having Makefile.config
2006-02-27(svn r3678) - NewGRF Codechange: remove redundant braces and temporary ↵peter1138
variables.
2006-02-27(svn r3677) Remove the FindLandscapeHeightByTile()s from the default AI.tron
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.
2006-02-26(svn r3676) -Change: [OSX] changed info about package to how to install the gamebjarni
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 ;)
2006-02-25(svn r3675) -Fix: [OSX] made the default gcc names for building universal ↵bjarni
binaries into the newest gcc for each target instead of hardcoding it for 4.0.0
2006-02-25(svn r3674) -Feature: [OSX] Added support for tripple binaries (binaries ↵bjarni
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
2006-02-25(svn r3673) -Codechange: [OSX] changed the makefile to autodetect if it ↵bjarni
compiles on G5 and then adds flags to optimise for G5 This will not interfere with crosscompiling or universal binaries
2006-02-25(svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten ↵bjarni
with the default ones when MAKEFILE_VERSION was changed
2006-02-24(svn r3671) -Code cleanup: fixed style and removed commented out code in ↵bjarni
video/cocoa_v.m
2006-02-24(svn r3670) -Codechange: [OSX] rewrote a part of the cocoa video driver to ↵bjarni
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
2006-02-24(svn r3669) Really wipe all data when making a void tiletron
Thanks to Belugas, egladil and Rubidium for their inspiration and hard work, which all this stuff is based on
2006-02-24(svn r3668) Add a function to turn a tile into a tree tiletron
2006-02-24(svn r3667) Fix the cause of an assertion I triggered in r3665tron
2006-02-24(svn r3666) Fix up svn properties and add header files to Windows project files.peter1138
2006-02-24(svn r3665) Add a function to turn a tile into a clear tiletron
2006-02-24(svn r3664) Add a function to turn a tile into a void tiletron
2006-02-24(svn r3663) - Fix: [Multistop] Check the status of the destination road stop ↵peter1138
instead of a station's first road stop. This only has effect with road vehicle queuing disabled.
2006-02-23(svn r3662) Fix regression FS#58 with union, endiannes and static ↵Darkvater
decleration problems. Removed the union.
2006-02-23(svn r3661) -Fix [PPC computers] quick dirty fix for failure to start the ↵bjarni
game on BE CPUs 3626 broke the game on Big endian CPUs and this is a quick dirty fix so the nightly builds for OSX and MorphOS will work again the game will still fail on 64 bit BE CPUs note: the game runs in 32 bit mode on G5, so it will work on G5 we need to make a better fix for this, but we also need the nightly builds to work
2006-02-23(svn r3660) Convert further road bits and type references to the functions/enumstron
2006-02-23(svn r3659) Add function to get the road bits of a level crossingtron