Commit Graph

3267 Commits (09aabd8ea39ee3dfa99d851412c45197f6c218e2)
 

Author SHA1 Message Date
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.
19 years ago
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.
19 years ago
Darkvater 8e8bd459a6 (svn r3718) - Add proper Doxygen comments to some saveload-structs (using ///<) 19 years ago
peter1138 058ccfb157 (svn r3717) - [2cc] Add 2cc colour maps and use for newgrf engines requiring them. Currently the second colour is fixed to be the player's colour. 19 years ago
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. 19 years ago
tron 116fb6dff6 (svn r3714) Add functions to turn tiles into water and shore tiles 19 years ago
Darkvater 78d666eb8e (svn r3713) - 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).
19 years ago
Darkvater 0ef8e80667 (svn r3712) - Change the boolean assignment/reading from == 1 to != 0 as suggested by Tron. 19 years ago
Darkvater f86be948d8 (svn r3711) - 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 19 years ago
Darkvater b4794ddc3b (svn r3710) - Use the general function DrawArrowButtons() instead of doing it manually. The function has two parameters added, colour and an enabled flag. 19 years ago
bjarni 6ab5bb6070 (svn r3707) -Fix: made the generated Finnish town names sound more Finnish (ln-)
note: <ln->     Bjarni: please go ahead and commit it, i'll take the responsibility if something should go wrong.
19 years ago
peter1138 5a9f6081dd (svn r3701) [2cc] move vehicle/engine palette functions out of header file and document the remaining definitions 19 years ago
tron b2c5ecaa22 (svn r3699) Replace some magic numbers for checking for a suitable slope for a level crossing by some less magic numbers 19 years ago
tron 5d6ec6b4f0 (svn r3698) Add GetCrossingRailBits() and ComplementRoadBits(). Simplify the code by using them 19 years ago
tron 7b106a3d8f (svn r3697) Rename DIAG1/DIAG2 to X resp. Y as this conveys a bit better in which direction a pieces of rail goes 19 years ago
tron 28fc670fe2 (svn r3696) 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 19 years ago
tron 7a3a9e6262 (svn r3695) Add 2 MarkTileByTile() which I forgot in r3689 (noticed by Belugas) 19 years ago
tron a8febcf209 (svn r3689) Add functions to turn a tile into either a normal road tile, a level crossing or a road depot 19 years ago
tron 38122ba0f5 (svn r3687) Complete some bits I missed whenn adding accessor functions for road types and pieces 19 years ago
tron 0f898e168d (svn r3686) 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
19 years ago
peter1138 6863d21382 (svn r3685) Include a file missed from r3684... 19 years ago
peter1138 2e2ed81e40 (svn r3684) - NewGRF: Support loading of miscellaneous flags (not used yet) 19 years ago
tron ff102fd115 (svn r3683) Get rid of another FindLandscapeHeight() 19 years ago
bjarni 301f91c71c (svn r3682) -Fix: didn't write $ correct in G5_detector in r3673, which caused problems for tortoisesvn 19 years ago
peter1138 b32bd10590 (svn r3681) - [Multistop] Check the RoadStop type before check its status. This fixes an assert introduced in r3663. Also fix the return type of GetRoadStopType(). 19 years ago
tron c998cf0750 (svn r3680) Fix some magic numbers which got damaged in r1768
-Fix: Correctly restore the roadside after roadworks are finished
19 years ago
bjarni 569b1939c6 (svn r3679) -Fix: [OSX] fixed warning introduced in r3670 about permission denied in G5_detector.c when compiling without having Makefile.config 19 years ago
peter1138 d1dabedb73 (svn r3678) - NewGRF Codechange: remove redundant braces and temporary variables. 19 years ago
tron 223aa411a7 (svn r3677) 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.
19 years ago
bjarni 04f072c3c1 (svn r3676) -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 ;)
19 years ago
bjarni 419bd4fb89 (svn r3675) -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 19 years ago
bjarni b764f8d676 (svn r3674) -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
19 years ago
bjarni 8e7c2555fe (svn r3673) -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
19 years ago
bjarni fb301cced7 (svn r3672) -Fix: [makefile] fixed bug where some settings where overwritten with the default ones when MAKEFILE_VERSION was changed 19 years ago
bjarni 6400e07918 (svn r3671) -Code cleanup: fixed style and removed commented out code in video/cocoa_v.m 19 years ago
bjarni aa3e439a68 (svn r3670) -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
19 years ago
tron af9463187b (svn r3669) 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
19 years ago
tron dd26e1f197 (svn r3668) Add a function to turn a tile into a tree tile 19 years ago
tron c18791022e (svn r3667) Fix the cause of an assertion I triggered in r3665 19 years ago
peter1138 5871a45b20 (svn r3666) Fix up svn properties and add header files to Windows project files. 19 years ago
tron 3cde68077e (svn r3665) Add a function to turn a tile into a clear tile 19 years ago
tron 6b7d4721bd (svn r3664) Add a function to turn a tile into a void tile 19 years ago
peter1138 ea59cc4a26 (svn r3663) - 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. 19 years ago
Darkvater f3b50cdd35 (svn r3662) Fix regression FS#58 with union, endiannes and static decleration problems. Removed the union. 19 years ago
bjarni 6e4bd06aa1 (svn r3661) -Fix [PPC computers] quick dirty fix for failure to start the 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
19 years ago
tron b26d54585f (svn r3660) Convert further road bits and type references to the functions/enums 19 years ago
tron a975616303 (svn r3659) Add function to get the road bits of a level crossing 19 years ago
tron 2f8e3dcc05 (svn r3658) Add functions and symbolic names to retrieve road tile types and road pieces 19 years ago
tron d239ec0e96 (svn r3657) Fix indentation and remove now unused variable, which i forgot in r3655 19 years ago
tron ad1e7c1da8 (svn r3656) Simplify the overly complicated check for road pieces under a bridge 19 years ago