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

    void *inifile;
    smiley_t *smiley;
    char *file_buffer;
    wchar_t temp_string[MAX_PATH];
-//   wchar_t smiley_pathname[MAX_PATH];
    wchar_t *smiley_name;
    size_t smiley_namelen;
    int candidate_index;
    int language_index;
    int program_index;
    swprintf_s (filename, WCHAR_SIZEOF (filename), L"%s/config.ini", app_path);
    inifile = INIFile_LoadINIFile (filename);
    // read the INI file (if it doesn't exist, default values will be fed)
-   // [gameplay]
+   // [options] -- FIXME: should be [gameplay] but would cause backwards compatibility problems
-   options.want_lastmove = (INIFile_ReadEntryAsBool (inifile, L"options", L"highlight last move", true) > 0);
+   options.want_lastmove          = (INIFile_ReadEntryAsBool (inifile, L"options", L"highlight last move", true) > 0);
-   options.want_possiblemoves = (INIFile_ReadEntryAsBool (inifile, L"options", L"highlight possible moves", true) > 0);
+   options.want_possiblemoves     = (INIFile_ReadEntryAsBool (inifile, L"options", L"highlight possible moves", true) > 0);
-   options.want_threats = (INIFile_ReadEntryAsBool (inifile, L"options", L"highlight king's threats", true) > 0);
+   options.want_threats           = (INIFile_ReadEntryAsBool (inifile, L"options", L"highlight king's threats", true) > 0);
-   options.want_animations = (INIFile_ReadEntryAsBool (inifile, L"options", L"display part animations", true) > 0);
+   options.want_animations        = (INIFile_ReadEntryAsBool (inifile, L"options", L"display part animations", true) > 0);
    options.want_slidinganimations = (INIFile_ReadEntryAsBool (inifile, L"options", L"display part sliding animations", true) > 0);
-   options.want_takenparts = (INIFile_ReadEntryAsBool (inifile, L"options", L"show taken parts", true) > 0);
+   options.want_takenparts        = (INIFile_ReadEntryAsBool (inifile, L"options", L"show taken parts", true) > 0);
-   options.want_turn = (INIFile_ReadEntryAsBool (inifile, L"options", L"show turn", true) > 0);
+   options.want_turn              = (INIFile_ReadEntryAsBool (inifile, L"options", L"show turn", true) > 0);
-   options.want_clock = (INIFile_ReadEntryAsBool (inifile, L"options", L"show game clock", true) > 0);
+   options.want_clock             = (INIFile_ReadEntryAsBool (inifile, L"options", L"show game clock", true) > 0);
-   options.clock_color = INIFile_ReadEntryAsUnsignedLong (inifile, L"options", L"game clock color", 0x00007f00); // dark blue, in RGBA
+   options.clock_color            = INIFile_ReadEntryAsUnsignedLong (inifile, L"options", L"game clock color", 0x00007f00); // dark blue, in RGBA
-   options.want_history = (INIFile_ReadEntryAsBool (inifile, L"options", L"show game history", true) > 0);
+   options.want_history           = (INIFile_ReadEntryAsBool (inifile, L"options", L"show game history", true) > 0);
-   options.history_color = INIFile_ReadEntryAsUnsignedLong (inifile, L"options", L"game history color", 0xe7e7e700); // light grey, in RGBA
+   options.history_color          = INIFile_ReadEntryAsUnsignedLong (inifile, L"options", L"game history color", 0xe7e7e700); // light grey, in RGBA
-   options.want_sepiafilter = (INIFile_ReadEntryAsBool (inifile, L"options", L"use sepia filter for past moves", true) > 0);
+   options.want_playblackside     = (INIFile_ReadEntryAsBool (inifile, L"options", L"local player prefers black", false) > 0);
-   options.want_autorotateon1vs1 = (INIFile_ReadEntryAsBool (inifile, L"options", L"auto-rotate board",true) > 0);
+   options.want_autorotateon1vs1  = (INIFile_ReadEntryAsBool (inifile, L"options", L"auto-rotate board", true) > 0);
-   options.rotate_speed = INIFile_ReadEntryAsLong (inifile, L"options", L"rotation speed", 10);
+   options.rotate_speed           = INIFile_ReadEntryAsLong (inifile, L"options", L"rotation speed", 10);
    // [display]
    READ_WIDESTRING (temp_string, inifile, L"display", L"language", L"auto"); // first, try to read the language from the config file
    is_language_auto = (wcscmp (temp_string, L"auto") == 0); // remember is language is set to be automatically chosen
    for (language_index = 0; language_index < language_count; language_index++)
             break; // stop searching as soon as we find it
+         }
+   }
    if (language_index == language_count)
       language_id = 0; // if still not found, fallback to the first language known
-   options.want_fullscreen = (INIFile_ReadEntryAsBool (inifile, L"display", L"fullscreen", false) > 0);
+   options.want_fullscreen       = (INIFile_ReadEntryAsBool (inifile, L"display", L"fullscreen", false) > 0);
-   options.want_maximized = (INIFile_ReadEntryAsBool (inifile, L"display", L"maximized", false) > 0);
+   options.want_maximized        = (INIFile_ReadEntryAsBool (inifile, L"display", L"maximized", false) > 0);
-   options.window_width = INIFile_ReadEntryAsLong (inifile, L"display", L"window width", 1024);
+   options.window_width          = INIFile_ReadEntryAsLong (inifile, L"display", L"window width", 1024);
-   options.window_height = INIFile_ReadEntryAsLong (inifile, L"display", L"window height", 768);
+   options.window_height         = INIFile_ReadEntryAsLong (inifile, L"display", L"window height", 768);
-   options.want_filtering = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable texture filtering", true) > 0);
+   options.want_filtering        = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable texture filtering", true) > 0);
-   options.want_hiquality = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable high quality filtering", true) > 0);
+   options.want_hiquality        = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable high quality filtering", true) > 0);
    options.want_specularlighting = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable specular lighting", true) > 0);
-   options.want_reflections = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable board reflections", true) > 0);
+   options.want_reflections      = (INIFile_ReadEntryAsBool (inifile, L"display", L"enable board reflections", true) > 0);
+   options.want_sepiafilter      = (INIFile_ReadEntryAsBool (inifile, L"display", L"use sepia filter for past moves", true) > 0);
+   options.want_startwithtopview = (INIFile_ReadEntryAsBool (inifile, L"display", L"always start with top view", false) > 0);
    // [sound]
    options.want_sounds = (INIFile_ReadEntryAsBool (inifile, L"sound", L"play sounds", true) > 0);
    // [theme]
    READ_WIDESTRING (wantedtheme_name, inifile, L"theme", L"theme name", L"Default");
-   want_grid = (INIFile_ReadEntryAsBool (inifile, L"theme", L"show grid", true) > 0);
+   want_grid             = (INIFile_ReadEntryAsBool (inifile, L"theme", L"show grid", true) > 0);
-   want_flaticons = (INIFile_ReadEntryAsBool (inifile, L"theme", L"flat icons instead", true) > 0);
+   want_flaticons        = (INIFile_ReadEntryAsBool (inifile, L"theme", L"flat icons instead", true) > 0);
    want_custombackground = (INIFile_ReadEntryAsBool (inifile, L"theme", L"use custom background", false) > 0);
    READ_WIDESTRING (custombackground_pathname, inifile, L"theme", L"custom background picture", L"");
    // [engine]
    Config_LoadEngines (); // discover all engine parameters from the engines folder
             break; // identify a suitable engine, break as soon as we find it
       if (program_index == options.engine.program_count)
          program_index = 0; // if NO engine is available, fallback on the first one
+   }
    options.engine.selected_program = program_index;
-   options.engine.depth = INIFile_ReadEntryAsLong (inifile, L"engine", L"allowed depth", 10);
+   options.engine.depth           = INIFile_ReadEntryAsLong (inifile, L"engine", L"allowed depth", 10);
-   options.engine.max_depth = INIFile_ReadEntryAsLong (inifile, L"engine", L"maximum depth", 20);
+   options.engine.max_depth       = INIFile_ReadEntryAsLong (inifile, L"engine", L"maximum depth", 20);
    options.engine.blunder_chances = INIFile_ReadEntryAsLong (inifile, L"engine", L"blunder chances", 5);
    options.engine.obstinacy_level = INIFile_ReadEntryAsLong (inifile, L"engine", L"obstinacy", -1);
-   options.engine.is_expert_mode = (INIFile_ReadEntryAsBool (inifile, L"engine", L"expert mode", false) > 0);
+   options.engine.is_expert_mode  = (INIFile_ReadEntryAsBool (inifile, L"engine", L"expert mode", false) > 0);
    // [network]
    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);
+   options.network.server_port         = INIFile_ReadEntryAsLong (inifile, L"network", L"server port", 5000);
    READ_WIDESTRING (options.network.login, inifile, L"network", L"login", L"guest");
    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_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);
+   options.network.want_motdonconnect  = (INIFile_ReadEntryAsBool (inifile, L"network", L"show MOTD on connect", true) > 0);
+   // [abbreviations]
+   READ_WIDESTRING (options.part_letters.rook,   inifile, L"abbreviations", L"rook",   L"R"); options.part_letters.rook[0]   = towupper (options.part_letters.rook[0]);   options.part_letters.rook[1]   = 0; // sanitize
+   READ_WIDESTRING (options.part_letters.knight, inifile, L"abbreviations", L"knight", L"N"); options.part_letters.knight[0] = towupper (options.part_letters.knight[0]); options.part_letters.knight[1] = 0; // sanitize
+   READ_WIDESTRING (options.part_letters.bishop, inifile, L"abbreviations", L"bishop", L"B"); options.part_letters.bishop[0] = towupper (options.part_letters.bishop[0]); options.part_letters.bishop[1] = 0; // sanitize
+   READ_WIDESTRING (options.part_letters.queen,  inifile, L"abbreviations", L"queen",  L"Q"); options.part_letters.queen[0]  = towupper (options.part_letters.queen[0]);  options.part_letters.rook[1]   = 0; // sanitize
+   READ_WIDESTRING (options.part_letters.king,   inifile, L"abbreviations", L"king",   L"K"); options.part_letters.king[0]   = towupper (options.part_letters.king[0]);   options.part_letters.king[1]   = 0; // sanitize
    // [registration]
    READ_WIDESTRING (options.registration.user_email, inifile, L"registration", L"user email", L"");
    options.registration.activation_code = (unsigned __int32) INIFile_ReadEntryAsLong (inifile, L"registration", L"activation code", 0);
       if (smiley_index < smiley_count)
+      {
          // if so, just copy data and data length from the smiley we already know
          smiley->rtf_data = smilies[smiley_index].rtf_data;
          smiley->rtf_len = smilies[smiley_index].rtf_len;
       }
       // else we found no match, we have to read the file ourselves
       else
+      {
          // build the smiley picture's file pathname and read that smiley's data as a hex string
          swprintf_s (temp_string, WCHAR_SIZEOF (temp_string), L"%s/data/smilies/%s", app_path, smiley->filename);
          _wfopen_s (&fp, temp_string, L"rb");
          if (fp == NULL)
             continue; // if this smiley picture file can't be opened, ignore this smiley
          // get the file length
          fseek (fp, 0, SEEK_END);
          file_length = ftell (fp);
          fseek (fp, 0, SEEK_SET);
          // mallocate space for file contents and read it
          file_buffer = (char *) SAFE_malloc (1 + file_length + 1 + 1, sizeof (char), false); // include null terminator
          file_buffer[0] = ' '; // first character is a whitespace
          fread (&file_buffer[1], file_length, sizeof (char), fp);
          file_buffer[1 + file_length] = ' '; // last character is a whitespace
+   }
    // close the INI file
    INIFile_FreeINIFile (inifile);
    return; // finished loading config
 }
 void Config_LoadEngines (void)
+{
    // this function loads the engine-specific parameters. The best place to call it is at the beginning
    // of a game versus the computer, just before the engine executable process is started.
    wchar_t temp_string[MAX_PATH];
    engineprogram_t *engineprogram;
-   int version_numbers[4];
+   int version_numbers[4] = { 0, 0, 0, 0 }; // initialize to make MSVC happy
    void *engine_inifile;
    WIN32_FIND_DATA wfd;
    HANDLE hFind;
    wchar_t *ptr;
       INIFile_FreeINIFile (engine_inifile); // close the engine config file
       options.engine.program_count++; // we've identified one engine more
    } while (FindNextFile (hFind, &wfd)); // ...and don't stop as long as there are directory entries to go
    FindClose (hFind); // close the search handle
    return; // engine parameters loaded successfully
+}
    HKEY hRegistryKey;
    // create a config file with the default values
    inifile = INIFile_NewINIFile ();
-   // [gameplay]
+   // [options] -- FIXME: should be [gameplay] but would cause backwards compatibility problems
    INIFile_WriteEntryAsBool (inifile, L"options", L"highlight last move", options.want_lastmove);
    INIFile_WriteEntryAsBool (inifile, L"options", L"highlight possible moves", options.want_possiblemoves);
    INIFile_WriteEntryAsBool (inifile, L"options", L"highlight king's threats", options.want_threats);
    INIFile_WriteEntryAsBool (inifile, L"options", L"display part animations", options.want_animations);
    INIFile_WriteEntryAsBool (inifile, L"options", L"display part sliding animations", options.want_slidinganimations);
    INIFile_WriteEntryAsBool (inifile, L"options", L"show turn", options.want_turn);
    INIFile_WriteEntryAsBool (inifile, L"options", L"show game clock", options.want_clock);
    INIFile_WriteEntryAsUnsignedLong (inifile, L"options", L"game clock color", options.clock_color);
    INIFile_WriteEntryAsBool (inifile, L"options", L"show game history", options.want_history);
    INIFile_WriteEntryAsUnsignedLong (inifile, L"options", L"game history color", options.history_color);
-   INIFile_WriteEntryAsBool (inifile, L"options", L"use sepia filter for past moves", options.want_sepiafilter);
+   INIFile_WriteEntryAsBool (inifile, L"options", L"local player prefers black", options.want_playblackside);
    INIFile_WriteEntryAsBool (inifile, L"options", L"auto-rotate board", options.want_autorotateon1vs1);
    INIFile_WriteEntryAsLong (inifile, L"options", L"rotation speed", options.rotate_speed);
    // [display]
    WRITE_WIDESTRING (L"display", L"language", (is_language_auto ? L"auto" : languages[language_id].name));
    INIFile_WriteEntryAsLong (inifile, L"display", L"window height", options.window_height);
    INIFile_WriteEntryAsBool (inifile, L"display", L"enable texture filtering", options.want_filtering);
    INIFile_WriteEntryAsBool (inifile, L"display", L"enable high quality filtering", options.want_hiquality);
    INIFile_WriteEntryAsBool (inifile, L"display", L"enable specular lighting", options.want_specularlighting);
    INIFile_WriteEntryAsBool (inifile, L"display", L"enable board reflections", options.want_reflections);
+   INIFile_WriteEntryAsBool (inifile, L"display", L"use sepia filter for past moves", options.want_sepiafilter);
+   INIFile_WriteEntryAsBool (inifile, L"display", L"always start with top view", options.want_startwithtopview);
    // [sound]
    INIFile_WriteEntryAsBool (inifile, L"sound", L"play sounds", options.want_sounds);
    // [theme]
    WRITE_WIDESTRING (L"network", L"login", options.network.login);
    WRITE_WIDESTRING (L"network", L"password", options.network.password);
    INIFile_WriteEntryAsBool (inifile, L"network", L"show server messages", options.network.want_servermessages);
    INIFile_WriteEntryAsBool (inifile, L"network", L"show public chat", options.network.want_publicchat);
    INIFile_WriteEntryAsBool (inifile, L"network", L"show MOTD on connect", options.network.want_motdonconnect);
+   // [abbreviations]
+   WRITE_WIDESTRING (L"abbreviations", L"rook",   options.part_letters.rook);
+   WRITE_WIDESTRING (L"abbreviations", L"knight", options.part_letters.knight);
+   WRITE_WIDESTRING (L"abbreviations", L"bishop", options.part_letters.bishop);
+   WRITE_WIDESTRING (L"abbreviations", L"queen",  options.part_letters.queen);
+   WRITE_WIDESTRING (L"abbreviations", L"king",   options.part_letters.king);
    // [registration]
    WRITE_WIDESTRING (L"registration", L"user email", options.registration.user_email);
    INIFile_WriteEntryAsLong (inifile, L"registration", L"activation code", (long) options.registration.activation_code);

Subversion Repositories Games.Chess Giants

Games.Chess Giants/config.cpp – Rev 192 → 193