X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=5daeffcefb3d000f26a856153fb75b23f18b5342;hb=d3e24bbfb70edb9a805806345eede28c7129baf8;hp=37a2760b08a3cc9224fe0df6aba70cefe655ce4b;hpb=64e7c54dce6ea8c063f04198c64c5057d751c928;p=rocksndiamonds.git diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 37a2760b..5daeffce 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -259,8 +259,7 @@ void PrintLineWithPrefix(char *prefix, char *line_chars, int line_length) the used memory is static, but will be overwritten by later calls, so if you want to save the result, copy it to a private string buffer; there can be 10 local calls of int2str() without buffering the result -- - the 11th call will then destroy the result from the first call and so on. -*/ + the 11th call will then destroy the result from the first call and so on. */ char *int2str(int number, int size) { @@ -286,9 +285,9 @@ char *int2str(int number, int size) } -/* something similar to "int2str()" above, but allocates its own memory - and has a different interface; we cannot use "itoa()", because this - seems to be already defined when cross-compiling to the win32 target */ +// something similar to "int2str()" above, but allocates its own memory +// and has a different interface; we cannot use "itoa()", because this +// seems to be already defined when cross-compiling to the win32 target char *i_to_a(unsigned int i) { @@ -307,8 +306,8 @@ char *i_to_a(unsigned int i) } -/* calculate base-2 logarithm of argument (rounded down to integer; - this function returns the number of the highest bit set in argument) */ +// calculate base-2 logarithm of argument (rounded down to integer; +// this function returns the number of the highest bit set in argument) int log_2(unsigned int x) { @@ -535,13 +534,13 @@ static char *get_corrected_real_name(char *real_name) // copy the name string, but not more than MAX_USERNAME_LEN characters while (*from_ptr && (int)(to_ptr - real_name_new) < MAX_USERNAME_LEN - 1) { - /* the name field read from "passwd" file may also contain additional - user information, separated by commas, which will be removed here */ + // the name field read from "passwd" file may also contain additional + // user information, separated by commas, which will be removed here if (*from_ptr == ',') break; - /* the user's real name may contain 'german sharp s' characters, - which have no equivalent in upper case letters (used by our fonts) */ + // the user's real name may contain 'german sharp s' characters, + // which have no equivalent in upper case letters (used by our fonts) if (*from_ptr == CHAR_BYTE_SHARP_S) { from_ptr++; @@ -1553,10 +1552,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode { KSYM_Meta_R, "XK_Meta_R", "right meta" }, { KSYM_Alt_L, "XK_Alt_L", "left alt" }, { KSYM_Alt_R, "XK_Alt_R", "right alt" }, -#if !defined(TARGET_SDL2) - { KSYM_Super_L, "XK_Super_L", "left super" }, // Win-L - { KSYM_Super_R, "XK_Super_R", "right super" }, // Win-R -#endif { KSYM_Mode_switch, "XK_Mode_switch", "mode switch" }, // Alt-R { KSYM_Multi_key, "XK_Multi_key", "multi key" }, // Ctrl-R @@ -1570,7 +1565,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode { KSYM_Page_Up, "XK_Page_Up", "page up" }, { KSYM_Page_Down, "XK_Page_Down", "page down" }, -#if defined(TARGET_SDL2) { KSYM_Select, "XK_Select", "select" }, { KSYM_Menu, "XK_Menu", "menu" }, // menu key { KSYM_Back, "XK_Back", "back" }, // back key @@ -1578,7 +1572,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode #if defined(PLATFORM_ANDROID) { KSYM_Rewind, "XK_Rewind", "rewind" }, { KSYM_FastForward, "XK_FastForward", "fast forward" }, -#endif #endif // ASCII 0x20 to 0x40 keys (except numbers) @@ -1629,7 +1622,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode { KSYM_udiaeresis, "XK_udiaeresis", "u umlaut" }, { KSYM_ssharp, "XK_ssharp", "sharp s" }, -#if defined(TARGET_SDL2) // special (non-ASCII) keys (UTF-8, for reverse mapping only) { KSYM_degree, "XK_degree", "\xc2\xb0" }, { KSYM_Adiaeresis, "XK_Adiaeresis", "\xc3\x84" }, @@ -1642,9 +1634,7 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode // other keys (for reverse mapping only) { KSYM_space, "XK_space", " " }, -#endif -#if defined(TARGET_SDL2) // keypad keys are not in numerical order in SDL2 { KSYM_KP_0, "XK_KP_0", "keypad 0" }, { KSYM_KP_1, "XK_KP_1", "keypad 1" }, @@ -1656,7 +1646,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode { KSYM_KP_7, "XK_KP_7", "keypad 7" }, { KSYM_KP_8, "XK_KP_8", "keypad 8" }, { KSYM_KP_9, "XK_KP_9", "keypad 9" }, -#endif // end-of-array identifier { 0, NULL, NULL } @@ -1675,10 +1664,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode sprintf(name_buffer, "%c", 'a' + (char)(key - KSYM_a)); else if (key >= KSYM_0 && key <= KSYM_9) sprintf(name_buffer, "%c", '0' + (char)(key - KSYM_0)); -#if !defined(TARGET_SDL2) - else if (key >= KSYM_KP_0 && key <= KSYM_KP_9) - sprintf(name_buffer, "keypad %c", '0' + (char)(key - KSYM_KP_0)); -#endif else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST) sprintf(name_buffer, "F%d", (int)(key - KSYM_FKEY_FIRST + 1)); else if (key == KSYM_UNDEFINED) @@ -1714,10 +1699,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode sprintf(name_buffer, "XK_%c", 'a' + (char)(key - KSYM_a)); else if (key >= KSYM_0 && key <= KSYM_9) sprintf(name_buffer, "XK_%c", '0' + (char)(key - KSYM_0)); -#if !defined(TARGET_SDL2) - else if (key >= KSYM_KP_0 && key <= KSYM_KP_9) - sprintf(name_buffer, "XK_KP_%c", '0' + (char)(key - KSYM_KP_0)); -#endif else if (key >= KSYM_FKEY_FIRST && key <= KSYM_FKEY_LAST) sprintf(name_buffer, "XK_F%d", (int)(key - KSYM_FKEY_FIRST + 1)); else if (key == KSYM_UNDEFINED) @@ -1795,15 +1776,6 @@ static void translate_keyname(Key *keysym, char **x11name, char **name, int mode else if (c >= '0' && c <= '9') key = KSYM_0 + (Key)(c - '0'); } -#if !defined(TARGET_SDL2) - else if (strPrefix(name_ptr, "XK_KP_") && strlen(name_ptr) == 7) - { - char c = name_ptr[6]; - - if (c >= '0' && c <= '9') - key = KSYM_KP_0 + (Key)(c - '0'); - } -#endif else if (strPrefix(name_ptr, "XK_F") && strlen(name_ptr) <= 6) { char c1 = name_ptr[4]; @@ -2637,8 +2609,19 @@ char *get_mapped_token(char *token) // !!! make this dynamically configurable (init.c:InitArtworkConfig) !!! static char *map_token_prefix[][2] = { - { "char_procent", "char_percent" }, - { NULL, } + { "char_procent", "char_percent" }, + { "bd_magic_wall_filling", "bd_magic_wall.filling" }, + { "bd_magic_wall_emptying", "bd_magic_wall.emptying" }, + { "bd_butterfly_left", "bd_butterfly.left" }, + { "bd_butterfly_right", "bd_butterfly.right" }, + { "bd_butterfly_up", "bd_butterfly.up" }, + { "bd_butterfly_down", "bd_butterfly.down" }, + { "bd_firefly_left", "bd_firefly.left" }, + { "bd_firefly_right", "bd_firefly.right" }, + { "bd_firefly_up", "bd_firefly.up" }, + { "bd_firefly_down", "bd_firefly.down" }, + + { NULL, } }; int i; @@ -2736,8 +2719,8 @@ static char *get_special_base_token(struct ArtworkListInfo *artwork_info, return getStringCopyN(token, strlen(token) - len_suffix); } -/* This function checks if a string of the format "string1, string2, ..." - exactly contains a string . */ +// This function checks if a string of the format "string1, string2, ..." +// exactly contains a string . static boolean string_has_parameter(char *s, char *s_contained) { @@ -3758,9 +3741,9 @@ static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info, // check if the old and the new artwork file are the same if (*listnode && strEqual((*listnode)->source_filename, filename)) { - /* The old and new artwork are the same (have the same filename and path). - This usually means that this artwork does not exist in this artwork set - and a fallback to the existing artwork is done. */ + // The old and new artwork are the same (have the same filename and path). + // This usually means that this artwork does not exist in this artwork set + // and a fallback to the existing artwork is done. return; }