X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftoons.c;fp=src%2Flibgame%2Ftoons.c;h=2eb805bd7c2a8a3c00dad8a5d804fc8d9ec8e36b;hb=95ff39b11bc3c268d8206193bad1433ac9526c94;hp=6f4fd2f7c49e3e79b7d0b340ded7ade00cf45829;hpb=b640b9d7647df4cbba0e530f6f4bcece384048e4;p=rocksndiamonds.git diff --git a/src/libgame/toons.c b/src/libgame/toons.c index 6f4fd2f7..2eb805bd 100644 --- a/src/libgame/toons.c +++ b/src/libgame/toons.c @@ -88,10 +88,10 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame, static int get_toon_direction(char *direction_string_raw) { char *direction_string = getStringToLower(direction_string_raw); - int direction = (strcmp(direction_string, "left") == 0 ? MV_LEFT : - strcmp(direction_string, "right") == 0 ? MV_RIGHT : - strcmp(direction_string, "up") == 0 ? MV_UP : - strcmp(direction_string, "down") == 0 ? MV_DOWN : + int direction = (strEqual(direction_string, "left") ? MV_LEFT : + strEqual(direction_string, "right") ? MV_RIGHT : + strEqual(direction_string, "up") ? MV_UP : + strEqual(direction_string, "down") ? MV_DOWN : MV_NONE); free(direction_string); @@ -177,13 +177,13 @@ boolean AnimateToon(int toon_nr, boolean restart) { int pos_bottom = screen_info.height - anim->height; - if (strcmp(anim->position, "top") == 0) + if (strEqual(anim->position, "top")) pos_y = 0; - else if (strcmp(anim->position, "bottom") == 0) + else if (strEqual(anim->position, "bottom")) pos_y = pos_bottom; - else if (strcmp(anim->position, "upper") == 0) + else if (strEqual(anim->position, "upper")) pos_y = SimpleRND(pos_bottom / 2); - else if (strcmp(anim->position, "lower") == 0) + else if (strEqual(anim->position, "lower")) pos_y = pos_bottom / 2 + SimpleRND(pos_bottom / 2); else pos_y = SimpleRND(pos_bottom); @@ -205,9 +205,9 @@ boolean AnimateToon(int toon_nr, boolean restart) { int pos_right = screen_info.width - anim->width; - if (strcmp(anim->position, "left") == 0) + if (strEqual(anim->position, "left")) pos_x = 0; - else if (strcmp(anim->position, "right") == 0) + else if (strEqual(anim->position, "right")) pos_x = pos_right; else pos_x = SimpleRND(pos_right);