From ea50bed1713440917c20e4fb040a9fcb3577be9c Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:47:40 +0200 Subject: [PATCH] Running clang-format --- src/main.c | 2 +- src/map.c | 8 +------- src/player.c | 11 ++++++----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main.c b/src/main.c index 76446b4..dd8f647 100644 --- a/src/main.c +++ b/src/main.c @@ -1,10 +1,10 @@ #include "config.h" +#include #include #include #include #include -#include #if USB_FEATURE #include diff --git a/src/map.c b/src/map.c index fb68978..4b08e75 100644 --- a/src/map.c +++ b/src/map.c @@ -12,13 +12,7 @@ extern Map level2; extern Map level3; extern Map level4; -Map *worldRPG[] = { - &level0, - &level1, - &level2, - &level3, - &level4 -}; +Map *worldRPG[] = {&level0, &level1, &level2, &level3, &level4}; // extern ExtraData *extraRPG[]; diff --git a/src/player.c b/src/player.c index 1666c66..b81a424 100644 --- a/src/player.c +++ b/src/player.c @@ -171,10 +171,11 @@ bool player_collision(Game *game, Direction direction, /* check where the player is expected to go on the next move */ /* if outside the map, we check if there is a map on the other */ /* side of the current map*/ - if(0){ - //if(map_get_walkable(game, player_tile_x, player_tile_y) == MAP_OUTSIDE) { - // we compute the expected world coordinates accordingly - // while taking care of the scaling between fx and cg models (PXSIZE) + if(0) { + // if(map_get_walkable(game, player_tile_x, player_tile_y) == + // MAP_OUTSIDE) { + // we compute the expected world coordinates accordingly + // while taking care of the scaling between fx and cg models (PXSIZE) int worldX = (player->wx + dx) / PXSIZE; int worldY = (player->wy + dy) / PXSIZE; Map *map = map_get_for_coordinates(game, worldX, worldY); @@ -236,7 +237,7 @@ bool player_collision(Game *game, Direction direction, int speed = (on_walkable >= 0 && on_walkable < WALKABLE_TILE_MAX) ? walkable_speed[on_walkable] : 0; - //speed = SPEED; + // speed = SPEED; /* if he's on a hard tile */ if(!speed) {