From f83f192309542b306e874cf7d4dedc74e6384e62 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 2 Mar 2006 00:07:41 +0000 Subject: (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. --- settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'settings.h') diff --git a/settings.h b/settings.h index 4486c7568..eb5117101 100644 --- a/settings.h +++ b/settings.h @@ -47,7 +47,7 @@ typedef struct SettingDescBase { } SettingDescBase; typedef struct SettingDesc { - SettingDescBase desc; ///, Settings structure (going to configuration file) + SettingDescBase desc; ///< Settings structure (going to configuration file) SaveLoad save; ///< Internal structure (going to savegame, parts to config) } SettingDesc; -- cgit v1.2.3-54-g00ecf