diff --git a/IsometricMap/isometricRenderer.c b/IsometricMap/isometricRenderer.c index 461af93..79f244a 100644 --- a/IsometricMap/isometricRenderer.c +++ b/IsometricMap/isometricRenderer.c @@ -44,7 +44,7 @@ void IsometricRendererRenderIsometricMap(IsometricMap **map, InputHandler *input int j = 0; for(n = 0; n < 10; n++){ if(map[n] == 0){ - break; + continue; } for(i=0; i < map[n]->widthBounds; i++){ for(j=0; j < map[n]->heightBounds; j++){ diff --git a/game.c b/game.c index c4d14c2..c875769 100644 --- a/game.c +++ b/game.c @@ -7,18 +7,17 @@ #include "IsometricMap/isometricMap.h" #include "stdio.h" -Game * GameInit(){ - Game *game = (Game *) malloc(sizeof(Game)); +Game *GameInit() +{ + Game *game = (Game *)malloc(sizeof(Game)); game->cursorTextures[0] = LoadTexture("assets/cursor.gif"); game->cursorTextures[1] = LoadTexture("assets/cursor_down.gif"); - //game->cursorSprite = {&(cursorTextures[0]), 450, 225}; - //game->cursorSprite = (Sprite *) malloc(sizeof(Sprite)); + // game->cursorSprite = {&(cursorTextures[0]), 450, 225}; + // game->cursorSprite = (Sprite *) malloc(sizeof(Sprite)); game->cursorSprite = SpriteCreate(game->cursorTextures, 450, 225); - - Image worker1flip = LoadImage("assets/worker/worker-1.png"); ImageFlipHorizontal(&worker1flip); Image worker2flip = LoadImage("assets/worker/worker-2.png"); @@ -34,7 +33,7 @@ Game * GameInit(){ game->worker[1] = LoadTextureFromImage(worker3flip); game->worker[2] = LoadTexture("assets/worker/worker-4.png"); - game->inputHandler = (InputHandler *) malloc(sizeof(InputHandler)); + game->inputHandler = (InputHandler *)malloc(sizeof(InputHandler)); game->inputHandler->pressed = 0; game->inputHandler->rectStart.x = 0; game->inputHandler->rectStart.y = 0; @@ -48,63 +47,72 @@ Game * GameInit(){ game->inputHandler->cursorTextures = game->cursorTextures; game->inputHandler->cursorSprite = game->cursorSprite; - game->camera = (Camera2D *) malloc(sizeof(Camera2D)); + game->camera = (Camera2D *)malloc(sizeof(Camera2D)); game->camera->target.x = 0; game->camera->target.y = 0; game->camera->rotation = 0.0f; game->camera->zoom = 1.0f; + game->camera->offset.x = 0; + game->camera->offset.y = 0; game->sprites = ListInit(); - game->layers = ((IsometricMap **) malloc(10*sizeof(IsometricMap *))); + game->layers = ((IsometricMap **)malloc(10 * sizeof(IsometricMap *))); // Test Layers --- int n = 0; int i = 0; int j = 0; - for(n = 0; n < 10; n++){ + for (n = 0; n < 10; n++) + { ((game->layers))[n] = IsometricMapInit(n); } - for(n = 0; n <= 10; n++){ - for(i = 0; i < 100; i++){ - for(j = 0; j < 100; j++){ - switch(n){ - case 0: + for (n = 0; n <= 10; n++) + { + for (i = 0; i < 100; i++) + { + for (j = 0; j < 100; j++) + { + switch (n) + { + case 0: + IsometricMapAddTile(((game->layers))[n], i, j, 0); + break; + case 1: + if (i > 35 && i < 50 && j > 45 && j < 60) + { IsometricMapAddTile(((game->layers))[n], i, j, 0); - break; - case 1: - if(i > 35 && i < 50 && j > 45 && j < 60){ - IsometricMapAddTile(((game->layers))[n], i, j, 0); - } - break; - case 2: - if(i > 40 && i < 44 && j > 50 && j < 54){ - IsometricMapAddTile(((game->layers))[n], i, j, 1); - } - break; + } + break; + case 2: + if (i > 40 && i < 44 && j > 50 && j < 54) + { + IsometricMapAddTile(((game->layers))[n], i, j, 1); + } + break; } - - } + } } } - printf("ALARM\n"); - for(n = 0; n <= 10; n++){ - for(i = 0; i < 20-n*2; i++){ - for(j = 0; j < 20-n*2; j++){ + for (n = 0; n <= 10; n++) + { + for (i = 0; i < 20 - n * 2; i++) + { + for (j = 0; j < 20 - n * 2; j++) + { IsometricMapAddTile(((game->layers))[n], i, j, 0); - if(n == 9){ + if (n == 9) + { IsometricMapAddTile(((game->layers))[n], i, j, 1); } } } } - printf("ALARM\n"); // ------- return game; - } \ No newline at end of file diff --git a/game.o b/game.o deleted file mode 100644 index 6ab38a9..0000000 Binary files a/game.o and /dev/null differ diff --git a/inputHandler.o b/inputHandler.o deleted file mode 100644 index dea11f7..0000000 Binary files a/inputHandler.o and /dev/null differ diff --git a/isometricMap.o b/isometricMap.o deleted file mode 100644 index 73deaa8..0000000 Binary files a/isometricMap.o and /dev/null differ diff --git a/isometricRenderer.o b/isometricRenderer.o deleted file mode 100644 index e103aee..0000000 Binary files a/isometricRenderer.o and /dev/null differ diff --git a/list.o b/list.o deleted file mode 100644 index 503d8f7..0000000 Binary files a/list.o and /dev/null differ diff --git a/main.c b/main.c index bfc9174..5a4268f 100644 --- a/main.c +++ b/main.c @@ -13,6 +13,7 @@ int main(){ InitWindow(800, 450, "basic window"); + Texture2D amulet = LoadTexture("assets/amulet.png"); Game *game = GameInit(); // Hides the operating systems own cursor @@ -23,13 +24,12 @@ int main(){ BeginDrawing(); ClearBackground(RAYWHITE); - BeginMode2D(*(game->camera)); - IsometricRendererRenderIsometricMap(game->layers, game->inputHandler); ListDrawAllSprites(game->sprites, game->layers[0], game->camera); + DrawTexture(amulet, 400, 225, WHITE); EndMode2D(); // Moving cursor Sprite to Mouse Pos and drawing it diff --git a/main.o b/main.o deleted file mode 100644 index f7f180a..0000000 Binary files a/main.o and /dev/null differ diff --git a/spiel b/spiel deleted file mode 100755 index ae2dda1..0000000 Binary files a/spiel and /dev/null differ diff --git a/sprite.o b/sprite.o deleted file mode 100644 index e748cf4..0000000 Binary files a/sprite.o and /dev/null differ diff --git a/tile.o b/tile.o deleted file mode 100644 index a3f5170..0000000 Binary files a/tile.o and /dev/null differ