WebSVN – Games.Chess Giants – Diff – //config.cpp

 #include "common.h"
 // useful macros
-#define READ_WIDESTRING(dest,section,key,default_value) wcscpy_s ((dest), sizeof (dest) / sizeof (wchar_t), INIFile_ReadEntryAsString (inifile, (section), (key), (default_value)))
+#define READ_WIDESTRING(dest,inifile,section,key,default_value) wcscpy_s ((dest), sizeof (dest) / sizeof (wchar_t), INIFile_ReadEntryAsString ((inifile), (section), (key), (default_value)))
 #define WRITE_WIDESTRING(section,key,value) INIFile_WriteEntryAsString (inifile, (section), (key), (value))
 void Config_Load (void)
+{
    // this function opens and parses the INI configuration file for the program
    // WARNING: it does also build the smilies list !
    wchar_t filename[MAX_PATH];
    void *inifile;
+   void *engine_inifile;
    smiley_t *smiley;
    char *file_buffer;
    wchar_t smiley_pathname[MAX_PATH];
    wchar_t *smiley_name;
    int smiley_index;
    // [sound]
    options.want_sounds = (INIFile_ReadEntryAsBool (inifile, L"sound", L"play sounds", true) > 0);
    // [theme]
-   READ_WIDESTRING (wantedtheme_name, L"theme", L"theme name", L"Marble");
+   READ_WIDESTRING (wantedtheme_name, inifile, L"theme", L"theme name", L"Marble");
    want_grid = (INIFile_ReadEntryAsBool (inifile, L"theme", L"show grid", false) > 0);
    want_flaticons = (INIFile_ReadEntryAsBool (inifile, L"theme", L"flat icons instead", false) > 0);
    want_custombackground = (INIFile_ReadEntryAsBool (inifile, L"theme", L"use custom background", false) > 0);
-   READ_WIDESTRING (custombackground_pathname, L"theme", L"custom background picture", L"");
+   READ_WIDESTRING (custombackground_pathname, inifile, L"theme", L"custom background picture", L"");
    // [engine]
-   READ_WIDESTRING (options.engine.name, L"engine", L"name", L"Crafty v23.2");
+   READ_WIDESTRING (options.engine.program, inifile, L"engine", L"program", L"Crafty");
-   READ_WIDESTRING (options.engine.cmdline, L"engine", L"command line", L"crafty.exe");
-   READ_WIDESTRING (options.engine.init_file, L"engine", L"initialization file", L"init.txt");
    options.engine.depth = INIFile_ReadEntryAsLong (inifile, L"engine", L"allowed depth", 4);
    options.engine.max_depth = INIFile_ReadEntryAsLong (inifile, L"engine", L"maximum depth", 100);
    options.engine.blunder_chances = INIFile_ReadEntryAsLong (inifile, L"engine", L"blunder chances", 0);
    options.engine.obstinacy_level = INIFile_ReadEntryAsLong (inifile, L"engine", L"obstinacy", 0);
    options.engine.is_expert_mode = (INIFile_ReadEntryAsBool (inifile, L"engine", L"expert mode", false) > 0);
-   READ_WIDESTRING (options.engine.replystring_move, L"engine", L"move string", L"): ");
-   READ_WIDESTRING (options.engine.replystring_hint, L"engine", L"hint string", L"Hint: ");
+   // given the selected engine program, load and interpret the right engine config file
+   swprintf_s (filename, WCHAR_SIZEOF (filename), L"%s/engines/%s/engine.ini", app_path, options.engine.program);
+   engine_inifile = INIFile_LoadINIFile (filename);
+   if (engine_inifile != NULL)
+   {
+      READ_WIDESTRING (options.engine.name, engine_inifile, L"engine", L"name", L"Crafty v24.0");
+      READ_WIDESTRING (options.engine.cmdline, engine_inifile, L"engine", L"command line", L"crafty.exe");
+      READ_WIDESTRING (options.engine.replystring_move, engine_inifile, L"engine", L"move string", L"): ");
+      READ_WIDESTRING (options.engine.replystring_hint, engine_inifile, L"engine", L"hint string", L"Hint: ");
-   READ_WIDESTRING (options.engine.command_new, L"engine", L"new game command", L"new");
+      READ_WIDESTRING (options.engine.command_new, engine_inifile, L"engine", L"new game command", L"new");
-   READ_WIDESTRING (options.engine.command_setboard, L"engine", L"setup table from FEN command", L"setboard");
+      READ_WIDESTRING (options.engine.command_setboard, engine_inifile, L"engine", L"setup table from FEN command", L"setboard");
-   READ_WIDESTRING (options.engine.command_sd, L"engine", L"search depth set command", L"sd");
+      READ_WIDESTRING (options.engine.command_sd, engine_inifile, L"engine", L"search depth set command", L"sd");
-   READ_WIDESTRING (options.engine.command_go, L"engine", L"play command", L"go");
+      READ_WIDESTRING (options.engine.command_go, engine_inifile, L"engine", L"play command", L"go");
-   READ_WIDESTRING (options.engine.command_hint, L"engine", L"hint command", L"hint");
+      READ_WIDESTRING (options.engine.command_hint, engine_inifile, L"engine", L"hint command", L"hint");
-   READ_WIDESTRING (options.engine.command_force, L"engine", L"force move command", L"force");
+      READ_WIDESTRING (options.engine.command_force, engine_inifile, L"engine", L"force move command", L"force");
-   READ_WIDESTRING (options.engine.command_quit, L"engine", L"quit command", L"quit");
+      READ_WIDESTRING (options.engine.command_quit, engine_inifile, L"engine", L"quit command", L"quit");
+      INIFile_FreeINIFile (engine_inifile); // close the engine config file
+   }
    // [network]
-   READ_WIDESTRING (options.network.server_address, L"network", L"server address", L"freechess.org");
+   READ_WIDESTRING (options.network.server_address, inifile, L"network", L"server address", L"freechess.org");
    options.network.server_port = INIFile_ReadEntryAsLong (inifile, L"network", L"server port", 5000);
-   READ_WIDESTRING (options.network.login, L"network", L"login", L"guest");
+   READ_WIDESTRING (options.network.login, inifile, L"network", L"login", L"guest");
-   READ_WIDESTRING (options.network.password, L"network", L"password", L"");
+   READ_WIDESTRING (options.network.password, inifile, L"network", L"password", L"");
    options.network.want_servermessages = (INIFile_ReadEntryAsBool (inifile, L"network", L"show server messages", true) > 0);
    options.network.want_publicchat = (INIFile_ReadEntryAsBool (inifile, L"network", L"show public chat", true) > 0);
    options.network.want_motdonconnect = (INIFile_ReadEntryAsBool (inifile, L"network", L"show MOTD on connect", true) > 0);
    // [registration]
-   READ_WIDESTRING (options.registration.user_email, L"registration", L"user email", L"");
+   READ_WIDESTRING (options.registration.user_email, inifile, L"registration", L"user email", L"");
    options.registration.activation_code = INIFile_ReadEntryAsLong (inifile, L"registration", L"activation code", 0);
    // [smilies]
    smilies = NULL;
    smiley_count = 0;
       wcscpy_s (smiley->name, WCHAR_SIZEOF (smiley->name), smiley_name);
       smiley->name[0] = L' '; // convert leading quote to a space
       smiley->name[wcslen (smiley->name) - 1] = L' '; // convert ending quote to a space
       // now read the smiley's corresponding picture file
-      READ_WIDESTRING (smiley->filename, L"smilies", smiley_name, L"smile.wmf");
+      READ_WIDESTRING (smiley->filename, inifile, L"smilies", smiley_name, L"smile.wmf");
       // is this filename the same as another smiley we know already ?
       for (smiley_index = 0; smiley_index < smiley_count; smiley_index++)
          if (wcscmp (smilies[smiley_index].filename, smiley->filename) == 0)
             break; // break as soon as we find a match
    INIFile_WriteEntryAsBool (inifile, L"theme", L"flat icons instead", want_flaticons);
    INIFile_WriteEntryAsBool (inifile, L"theme", L"use custom background", want_custombackground);
    WRITE_WIDESTRING (L"theme", L"custom background picture", custombackground_pathname);
    // [engine]
-   WRITE_WIDESTRING (L"engine", L"name", options.engine.name);
+   WRITE_WIDESTRING (L"engine", L"program", options.engine.program);
-   WRITE_WIDESTRING (L"engine", L"command line", options.engine.cmdline);
-   WRITE_WIDESTRING (L"engine", L"initialization file", options.engine.init_file);
    INIFile_WriteEntryAsLong (inifile, L"engine", L"allowed depth", options.engine.depth);
    INIFile_WriteEntryAsLong (inifile, L"engine", L"maximum depth", options.engine.max_depth);
    INIFile_WriteEntryAsLong (inifile, L"engine", L"blunder chances", options.engine.blunder_chances);
    INIFile_WriteEntryAsLong (inifile, L"engine", L"obstinacy", options.engine.obstinacy_level);
    INIFile_WriteEntryAsBool (inifile, L"engine", L"expert mode", options.engine.is_expert_mode);
-   WRITE_WIDESTRING (L"engine", L"move string", options.engine.replystring_move);
-   WRITE_WIDESTRING (L"engine", L"hint string", options.engine.replystring_hint);
-   WRITE_WIDESTRING (L"engine", L"new game command", options.engine.command_new);
-   WRITE_WIDESTRING (L"engine", L"setup table from FEN command", options.engine.command_setboard);
-   WRITE_WIDESTRING (L"engine", L"search depth set command", options.engine.command_sd);
-   WRITE_WIDESTRING (L"engine", L"play command", options.engine.command_go);
-   WRITE_WIDESTRING (L"engine", L"hint command", options.engine.command_hint);
-   WRITE_WIDESTRING (L"engine", L"force move command", options.engine.command_force);
-   WRITE_WIDESTRING (L"engine", L"quit command", options.engine.command_quit);
    // [network]
    WRITE_WIDESTRING (L"network", L"server address", options.network.server_address);
    INIFile_WriteEntryAsLong (inifile, L"network", L"server port", options.network.server_port);
    WRITE_WIDESTRING (L"network", L"login", options.network.login);

Subversion Repositories Games.Chess Giants

Games.Chess Giants//config.cpp – Rev 29 → 32