diff options
| -rw-r--r-- | src/asset_defs.c | 2 | ||||
| -rw-r--r-- | src/players.c | 4 | ||||
| -rw-r--r-- | src/rounds.c | 4 | ||||
| -rw-r--r-- | src/zombies.c | 7 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/asset_defs.c b/src/asset_defs.c index 6c8fc08..33f50d8 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -128,7 +128,7 @@ font* get_font(platform_window* window, float scale) { float window_scale = window->width / 800.0f; float diff = window_scale - 1.0f; - float step = 1/5.0f; + float step = 1/3.0f; int index_of_original = (int)(scale / step); int index_to_return = index_of_original + (int)(diff/step); diff --git a/src/players.c b/src/players.c index f35df16..32b62cd 100644 --- a/src/players.c +++ b/src/players.c @@ -583,7 +583,9 @@ void draw_players(platform_window* window) { float height = get_height_of_tile_under_coords(players[i].playerx, players[i].playery); players[i].height = height; - draw_player_bullet_cone(window, &players[i]); + if (players[i].interact_state == INTERACT_IDLE) { + draw_player_bullet_cone(window, &players[i]); + } draw_player(window, &players[i], i); } } diff --git a/src/rounds.c b/src/rounds.c index 27a4806..67fa2b5 100644 --- a/src/rounds.c +++ b/src/rounds.c @@ -70,11 +70,11 @@ void draw_round(platform_window* window) { int characters_visible_count = _current_round.round_timer/delay_per_char; if (characters_visible_count > round_text_len) characters_visible_count = round_text_len; round_text[characters_visible_count] = 0; - font* round_text_fnt = get_font(window, 1.0f); + font* round_text_fnt = get_font(window, 2.0f); text_w = renderer->calculate_text_width(round_text_fnt, round_text); final_text_y = _global_camera.y + window->height/4.0f; - int box_pad = 10; + int box_pad = 15; int box_x = window_center_x - (text_w/2)+1 - box_pad; int box_y = final_text_y - box_pad; int box_w = text_w + box_pad*2; diff --git a/src/zombies.c b/src/zombies.c index 637d4dd..116b5fa 100644 --- a/src/zombies.c +++ b/src/zombies.c @@ -105,9 +105,12 @@ static vec2f get_random_target_for_zombie(zombie o) { vec2f target = {0,0}; try_again:; int dist = 10; - target.x = o.position.x + (rand() % dist) - (dist/2); - target.y = o.position.y + (rand() % dist) - (dist/2); + target.x = o.position.x + (rand() % dist) - (dist/2) +1; + target.y = o.position.y + (rand() % dist) - (dist/2) +1; + if (target.x <= 0 || target.y <= 0) goto try_again; + if (target.x >= MAP_SIZE_X-1 || target.y >= MAP_SIZE_Y-1) goto try_again; + object obj = get_object_at_tile(target.x, target.y); if (obj.active) goto try_again; |