X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame_bd%2Fbd_caveobject.c;h=dc105cdad01f6802a16b9c9fd76cd050e6ab8cf9;hb=646498771246351aaf243f5ab889179bd9684991;hp=254f373db3161b596963a956a833d7635e505207;hpb=7fb08abe58b2c84e36a5ed247d2103e08ae98aa4;p=rocksndiamonds.git diff --git a/src/game_bd/bd_caveobject.c b/src/game_bd/bd_caveobject.c index 254f373d..dc105cda 100644 --- a/src/game_bd/bd_caveobject.c +++ b/src/game_bd/bd_caveobject.c @@ -615,10 +615,10 @@ GdObject *gd_object_new_from_string(char *str) return NULL; if (words) - g_strfreev(words); + freeStringArray(words); - words = g_strsplit_set(param, " ", -1); - l = g_strv_length(words); + words = getSplitStringArray(param, " ", -1); + l = getStringArrayLength(words); if (l < 10 || l > 19) return NULL; @@ -1277,7 +1277,7 @@ static void draw_random_fill(GdCave *cave, const GdObject *object, int level) rand = g_rand_new_with_seed(seed); /* for c64 random, use the 2*8 lsb. */ - gd_c64_random_set_seed(&c64_rand, seed/256%256, seed%256); + gd_c64_random_set_seed(&c64_rand, seed / 256 % 256, seed % 256); /* change coordinates if not in correct order */ if (y1 > y2) @@ -1318,7 +1318,7 @@ static void draw_random_fill(GdCave *cave, const GdObject *object, int level) if (randm < object->random_fill_probability[3]) element = object->random_fill[3]; - if (object->element==O_NONE || + if (object->element == O_NONE || gd_cave_get_rc(cave, x, y) == object->element) gd_cave_store_rc(cave, x, y, element, object); }