diff --git a/bin/back b/bin/back index 75b70b7..64b1b35 100755 Binary files a/bin/back and b/bin/back differ diff --git a/src/display.c b/src/display.c index 15f355d..49b64ed 100644 --- a/src/display.c +++ b/src/display.c @@ -117,7 +117,7 @@ void drawNumberToRenderer(SDL_Renderer* renderer, imgs data, int n, int X, int Y nIter--; } } else { - int toDraw = 0, remaining = -n, nIter = 1+ln_baseN(-n, 10); + int toDraw = 0, remaining = -n, nIter = ln_baseN(-n, 10); drawDigitToRenderer(renderer, data, -727, X, Y, W, H); while(nIter != 0) { toDraw = remaining%10; diff --git a/src/main.c b/src/main.c index 9b92fe0..10e07aa 100644 --- a/src/main.c +++ b/src/main.c @@ -43,7 +43,7 @@ int main(int argc, char** argv) { /* -------------------------------------------------------- */ //one_debug(); - parse_configs("templates.txt", 23); + parse_configs("templates.txt", 30); initialize(rend); diff --git a/src/move.c b/src/move.c index 266450f..09c4d09 100644 --- a/src/move.c +++ b/src/move.c @@ -25,7 +25,7 @@ double epsilon_x = 0.0; double epsilon_y = 0.0; bool checkCollision() { - return unpack_coord(gridGet(map, player_cx, player_cy)->chdata.lines, player_x, player_y); + return (unpack_coord(gridGet(map, player_cx, player_cy)->chdata.lines, player_x, player_y)); } void increment_x(double dx) { diff --git a/templates.txt b/templates.txt index 742487b..8bfcf24 100644 --- a/templates.txt +++ b/templates.txt @@ -34,6 +34,15 @@ 1 1 1 0 0 1 1 1 1 1 1 0 0 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 0 0 0 0 0 +1 1 1 0 0 0 0 0 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 + 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 @@ -52,6 +61,15 @@ 1 1 1 0 0 1 1 1 1 1 1 0 0 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 +1 1 1 0 0 1 1 1 + 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 1 1 0 0 0 0 0 0 1 @@ -70,6 +88,15 @@ 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 + 1 1 1 1 1 1 1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0 1 1 @@ -205,6 +232,42 @@ 0 0 1 0 0 1 1 1 1 1 1 1 1 1 1 1 +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 1 1 1 1 1 1 1 + +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +0 0 1 1 1 1 0 1 +1 0 1 1 1 1 0 1 +1 0 0 0 0 0 0 0 +1 1 1 0 0 1 1 1 + +1 1 1 0 0 1 1 1 +0 0 0 0 0 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +1 1 1 1 1 1 1 1 +0 0 0 0 0 1 1 1 +1 1 1 0 0 1 1 1 + +1 1 1 0 0 1 1 1 +0 0 0 0 0 0 1 1 +1 1 1 1 1 0 1 1 +1 1 1 1 1 0 0 0 +1 1 1 1 1 0 0 0 +1 1 1 1 1 0 1 1 +0 0 0 0 0 0 1 1 +1 1 1 0 0 1 1 1 + $ format is :