game/objects: Merge har_take_damage() if statements
@@ -595,13 +595,11 @@ void har_take_damage(object *obj, const str* string, float damage) {
// XXX hack - if the first frame has the 'k' tag, treat it as some vertical knockback
// we can't do this in player.c because it breaks the jaguar leap, which also uses the 'k' tag.
const sd_script_frame *frame = sd_script_get_frame(&obj->animation_state.parser, 0);
- if(frame != NULL) {
- if(sd_script_isset(frame, "k")) {
+ if(frame != NULL && sd_script_isset(frame, "k")) {
obj->vel.y -= 7;
}
}
}
-}
void har_spawn_oil(object *obj, vec2i pos, int amount, float gravity, int layer) {
har *h = object_get_userdata(obj);
