From e9282a62fba54bfea93f4178b693db1a44ee9f8e Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sun, 15 Jan 2023 22:45:24 +0100 Subject: [PATCH] Zwischenstand --- Entity/entity.c | 43 ++++++++++++++++--- Entity/entity.h | 3 ++ Entity/professions.h | 7 --- MapObject/mapobjectIDs.h | 16 ------- Sprite/sprite.c | 36 +--------------- Sprite/sprite.h | 2 - Textures/animationHandler.c | 12 +++--- Textures/animationHandler.h | 5 ++- Textures/textureIDs.h | 18 -------- Textures/textureatlas.c | 14 ++++++ Textures/textureatlas.h | 7 ++- assets/{ => entities}/worker/die-0.png | Bin assets/{ => entities}/worker/die-1.png | Bin assets/{ => entities}/worker/die-10.png | Bin assets/{ => entities}/worker/die-11.png | Bin assets/{ => entities}/worker/die-12.png | Bin assets/{ => entities}/worker/die-13.png | Bin assets/{ => entities}/worker/die-14.png | Bin assets/{ => entities}/worker/die-2.png | Bin assets/{ => entities}/worker/die-3.png | Bin assets/{ => entities}/worker/die-4.png | Bin assets/{ => entities}/worker/die-5.png | Bin assets/{ => entities}/worker/die-6.png | Bin assets/{ => entities}/worker/die-7.png | Bin assets/{ => entities}/worker/die-8.png | Bin assets/{ => entities}/worker/die-9.png | Bin assets/{ => entities}/worker/die.png | Bin assets/{ => entities}/worker/umackern-0.png | Bin assets/{ => entities}/worker/umackern-1.png | Bin assets/{ => entities}/worker/umackern-10.png | Bin assets/{ => entities}/worker/umackern-11.png | Bin assets/{ => entities}/worker/umackern-12.png | Bin assets/{ => entities}/worker/umackern-13.png | Bin assets/{ => entities}/worker/umackern-14.png | Bin assets/{ => entities}/worker/umackern-15.png | Bin assets/{ => entities}/worker/umackern-16.png | Bin assets/{ => entities}/worker/umackern-17.png | Bin assets/{ => entities}/worker/umackern-18.png | Bin assets/{ => entities}/worker/umackern-19.png | Bin assets/{ => entities}/worker/umackern-2.png | Bin assets/{ => entities}/worker/umackern-20.png | Bin assets/{ => entities}/worker/umackern-21.png | Bin assets/{ => entities}/worker/umackern-22.png | Bin assets/{ => entities}/worker/umackern-23.png | Bin assets/{ => entities}/worker/umackern-24.png | Bin assets/{ => entities}/worker/umackern-3.png | Bin assets/{ => entities}/worker/umackern-4.png | Bin assets/{ => entities}/worker/umackern-5.png | Bin assets/{ => entities}/worker/umackern-6.png | Bin assets/{ => entities}/worker/umackern-7.png | Bin assets/{ => entities}/worker/umackern-8.png | Bin assets/{ => entities}/worker/umackern-9.png | Bin assets/{ => entities}/worker/umackern.png | Bin assets/{ => entities}/worker/walk-0.png | Bin assets/{ => entities}/worker/walk-1.png | Bin assets/{ => entities}/worker/walk-10.png | Bin assets/{ => entities}/worker/walk-11.png | Bin assets/{ => entities}/worker/walk-12.png | Bin assets/{ => entities}/worker/walk-13.png | Bin assets/{ => entities}/worker/walk-14.png | Bin assets/{ => entities}/worker/walk-15.png | Bin assets/{ => entities}/worker/walk-16.png | Bin assets/{ => entities}/worker/walk-17.png | Bin assets/{ => entities}/worker/walk-18.png | Bin assets/{ => entities}/worker/walk-19.png | Bin assets/{ => entities}/worker/walk-2.png | Bin assets/{ => entities}/worker/walk-20.png | Bin assets/{ => entities}/worker/walk-21.png | Bin assets/{ => entities}/worker/walk-22.png | Bin assets/{ => entities}/worker/walk-23.png | Bin assets/{ => entities}/worker/walk-24.png | Bin assets/{ => entities}/worker/walk-3.png | Bin assets/{ => entities}/worker/walk-4.png | Bin assets/{ => entities}/worker/walk-5.png | Bin assets/{ => entities}/worker/walk-6.png | Bin assets/{ => entities}/worker/walk-7.png | Bin assets/{ => entities}/worker/walk-8.png | Bin assets/{ => entities}/worker/walk-9.png | Bin assets/{ => entities}/worker/walk.png | Bin assets/{ => entities}/worker/worker.png | Bin definitions.h | 22 ++++++++++ 81 files changed, 92 insertions(+), 93 deletions(-) delete mode 100644 Entity/professions.h delete mode 100644 MapObject/mapobjectIDs.h delete mode 100644 Textures/textureIDs.h rename assets/{ => entities}/worker/die-0.png (100%) rename assets/{ => entities}/worker/die-1.png (100%) rename assets/{ => entities}/worker/die-10.png (100%) rename assets/{ => entities}/worker/die-11.png (100%) rename assets/{ => entities}/worker/die-12.png (100%) rename assets/{ => entities}/worker/die-13.png (100%) rename assets/{ => entities}/worker/die-14.png (100%) rename assets/{ => entities}/worker/die-2.png (100%) rename assets/{ => entities}/worker/die-3.png (100%) rename assets/{ => entities}/worker/die-4.png (100%) rename assets/{ => entities}/worker/die-5.png (100%) rename assets/{ => entities}/worker/die-6.png (100%) rename assets/{ => entities}/worker/die-7.png (100%) rename assets/{ => entities}/worker/die-8.png (100%) rename assets/{ => entities}/worker/die-9.png (100%) rename assets/{ => entities}/worker/die.png (100%) rename assets/{ => entities}/worker/umackern-0.png (100%) rename assets/{ => entities}/worker/umackern-1.png (100%) rename assets/{ => entities}/worker/umackern-10.png (100%) rename assets/{ => entities}/worker/umackern-11.png (100%) rename assets/{ => entities}/worker/umackern-12.png (100%) rename assets/{ => entities}/worker/umackern-13.png (100%) rename assets/{ => entities}/worker/umackern-14.png (100%) rename assets/{ => entities}/worker/umackern-15.png (100%) rename assets/{ => entities}/worker/umackern-16.png (100%) rename assets/{ => entities}/worker/umackern-17.png (100%) rename assets/{ => entities}/worker/umackern-18.png (100%) rename assets/{ => entities}/worker/umackern-19.png (100%) rename assets/{ => entities}/worker/umackern-2.png (100%) rename assets/{ => entities}/worker/umackern-20.png (100%) rename assets/{ => entities}/worker/umackern-21.png (100%) rename assets/{ => entities}/worker/umackern-22.png (100%) rename assets/{ => entities}/worker/umackern-23.png (100%) rename assets/{ => entities}/worker/umackern-24.png (100%) rename assets/{ => entities}/worker/umackern-3.png (100%) rename assets/{ => entities}/worker/umackern-4.png (100%) rename assets/{ => entities}/worker/umackern-5.png (100%) rename assets/{ => entities}/worker/umackern-6.png (100%) rename assets/{ => entities}/worker/umackern-7.png (100%) rename assets/{ => entities}/worker/umackern-8.png (100%) rename assets/{ => entities}/worker/umackern-9.png (100%) rename assets/{ => entities}/worker/umackern.png (100%) rename assets/{ => entities}/worker/walk-0.png (100%) rename assets/{ => entities}/worker/walk-1.png (100%) rename assets/{ => entities}/worker/walk-10.png (100%) rename assets/{ => entities}/worker/walk-11.png (100%) rename assets/{ => entities}/worker/walk-12.png (100%) rename assets/{ => entities}/worker/walk-13.png (100%) rename assets/{ => entities}/worker/walk-14.png (100%) rename assets/{ => entities}/worker/walk-15.png (100%) rename assets/{ => entities}/worker/walk-16.png (100%) rename assets/{ => entities}/worker/walk-17.png (100%) rename assets/{ => entities}/worker/walk-18.png (100%) rename assets/{ => entities}/worker/walk-19.png (100%) rename assets/{ => entities}/worker/walk-2.png (100%) rename assets/{ => entities}/worker/walk-20.png (100%) rename assets/{ => entities}/worker/walk-21.png (100%) rename assets/{ => entities}/worker/walk-22.png (100%) rename assets/{ => entities}/worker/walk-23.png (100%) rename assets/{ => entities}/worker/walk-24.png (100%) rename assets/{ => entities}/worker/walk-3.png (100%) rename assets/{ => entities}/worker/walk-4.png (100%) rename assets/{ => entities}/worker/walk-5.png (100%) rename assets/{ => entities}/worker/walk-6.png (100%) rename assets/{ => entities}/worker/walk-7.png (100%) rename assets/{ => entities}/worker/walk-8.png (100%) rename assets/{ => entities}/worker/walk-9.png (100%) rename assets/{ => entities}/worker/walk.png (100%) rename assets/{ => entities}/worker/worker.png (100%) create mode 100644 definitions.h diff --git a/Entity/entity.c b/Entity/entity.c index bc49c37..313ac98 100644 --- a/Entity/entity.c +++ b/Entity/entity.c @@ -4,13 +4,12 @@ #include #include "../Sprite/sprite.h" #include "../MapObject/mapobject.h" -#include "../MapObject/mapobjectIDs.h" -#include "../Entity/professions.h" #include "../Textures/textureIDs.h" Entity * EntityInit(Sprite *sprite, int profession){ Entity *new = malloc(sizeof(Entity)); - + + new->angle = 0; new->sprite = sprite; new->destX = 0; new->destY = 0; @@ -103,9 +102,40 @@ void EntityListActAllEntities(Game *game){ angle = angle * RAD2DEG; angle -= 35.26; - current->sprite->angle = angle; - + if(angle <= 22.5 && angle >= -22.5){ + // E + AnimationChangeAnimation(current->animationHandler, E); + } + else if(angle > 0 && angle <= 67.5){ + // NE + AnimationChangeAnimation(current->animationHandler, NE); + } + else if(angle > 0 && angle <= 112.5){ + // N + AnimationChangeAnimation(current->animationHandler, N); + } + else if(angle > 0 && angle <= 157.5){ + // NW + AnimationChangeAnimation(current->animationHandler, NW); + } + else if(angle < 0 && angle >= -67.5){ + // SE + AnimationChangeAnimation(current->animationHandler, SE); + } + else if(angle < 0 && angle >= -112.5){ + // S + AnimationChangeAnimation(current->animationHandler, S); + } + else if(angle < 0 && angle >= -157.5){ + // SW + AnimationChangeAnimation(current->animationHandler, SW); + } + else{ + // W + AnimationChangeAnimation(current->animationHandler, W); + } } + } else{ if(current->profession == PR_BUILDER){ @@ -142,8 +172,9 @@ void EntityListActAllEntities(Game *game){ } - SpriteUpdate(current->sprite); + AnimationUpdate(current->animationHandler); + SpriteUpdate(current->sprite); SpriteListSpriteChanged(game->sprites, current->sprite); current = current->next; diff --git a/Entity/entity.h b/Entity/entity.h index 4390565..b2448fc 100644 --- a/Entity/entity.h +++ b/Entity/entity.h @@ -3,11 +3,14 @@ #include "../Sprite/sprite.h" #include "../game.h" #include "task.h" +#include "../Textures/animationHandler.h" typedef struct Entity Entity; typedef struct Entity{ Sprite *sprite; + AnimationHandler animationHandler; + float angle; float destX; float destY; int hasDestination; diff --git a/Entity/professions.h b/Entity/professions.h deleted file mode 100644 index a46a3e6..0000000 --- a/Entity/professions.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef PROFESSIONS_H_ -#define PROFESSIONS_H_ - -#define PR_NOWORK 0 -#define PR_BUILDER 1 - -#endif \ No newline at end of file diff --git a/MapObject/mapobjectIDs.h b/MapObject/mapobjectIDs.h deleted file mode 100644 index 8bc91d7..0000000 --- a/MapObject/mapobjectIDs.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef TEXTUREIDS_H_ -#define TEXTUREIDS_H_ - -#define N 0 -#define NE 1 -#define E 3 -#define SE 5 -#define S 7 -#define SW 6 -#define W 4 -#define NW 2 - -#define MO_Baustelle 0 -#define MO_Building 1 - -#endif \ No newline at end of file diff --git a/Sprite/sprite.c b/Sprite/sprite.c index e6466ef..d53bf1d 100644 --- a/Sprite/sprite.c +++ b/Sprite/sprite.c @@ -43,41 +43,7 @@ void SpriteUpdate(Sprite *sprite){ sprite->depth = sprite->x + sprite->y + sprite->z; - if(sprite->angle <= 22.5 && sprite->angle >= -22.5){ - // E - AnimationChangeAnimation(sprite->animationHandler, E); - } - else if(sprite->angle > 0 && sprite->angle <= 67.5){ - // NE - AnimationChangeAnimation(sprite->animationHandler, NE); - } - else if(sprite->angle > 0 && sprite->angle <= 112.5){ - // N - AnimationChangeAnimation(sprite->animationHandler, N); - } - else if(sprite->angle > 0 && sprite->angle <= 157.5){ - // NW - AnimationChangeAnimation(sprite->animationHandler, NW); - } - else if(sprite->angle < 0 && sprite->angle >= -67.5){ - // SE - AnimationChangeAnimation(sprite->animationHandler, SE); - } - else if(sprite->angle < 0 && sprite->angle >= -112.5){ - // S - AnimationChangeAnimation(sprite->animationHandler, S); - } - else if(sprite->angle < 0 && sprite->angle >= -157.5){ - // SW - AnimationChangeAnimation(sprite->animationHandler, SW); - } - else{ - // W - AnimationChangeAnimation(sprite->animationHandler, W); - } - - AnimationUpdate(sprite->animationHandler); - sprite->texture = sprite->animationHandler->currentFrame->texture; +// sprite->texture = sprite->animationHandler->currentFrame->texture; } Sprite * SpriteCreate(TextureAtlas *atlas, int textureID, int x, int y){ diff --git a/Sprite/sprite.h b/Sprite/sprite.h index a4dbf1c..8f819e8 100644 --- a/Sprite/sprite.h +++ b/Sprite/sprite.h @@ -9,13 +9,11 @@ typedef struct Sprite Sprite; typedef struct SpriteList SpriteList; typedef struct Sprite { - AnimationHandler *animationHandler; Texture2D *texture; float x; float y; float z; float depth; - float angle; Sprite *next; Sprite *prev; diff --git a/Textures/animationHandler.c b/Textures/animationHandler.c index 11e88cd..d832875 100644 --- a/Textures/animationHandler.c +++ b/Textures/animationHandler.c @@ -1,11 +1,12 @@ #include "animationHandler.h" #include "animation.h" -#include "stdlib.h" -#include "stdio.h" +#include +#include -AnimationHandler * AnimationHandlerInit(Animation **animations){ +AnimationHandler * AnimationHandlerInit(Animation **animations, Texture2D **spriteTexture){ AnimationHandler *new = malloc(sizeof(AnimationHandler)); + new->spriteTexture = spriteTexture; new->animations = animations; new->currentAnimation = 0; new->currentFrame = new->animations[new->currentAnimation]->head; @@ -17,7 +18,7 @@ AnimationHandler * AnimationHandlerInit(Animation **animations){ void AnimationUpdate(AnimationHandler *animationHandler){ animationHandler->deltaElapsed += GetFrameTime(); - + if(animationHandler->deltaElapsed >= 0.2){ if(animationHandler->forward == 1){ animationHandler->currentFrame = animationHandler->currentFrame->next; @@ -28,11 +29,13 @@ void AnimationUpdate(AnimationHandler *animationHandler){ animationHandler->deltaElapsed = 0; } + *(animationHandler->spriteTexture) = animationHandler->currentFrame->texture; } void AnimationReset(AnimationHandler *animationHandler){ animationHandler->currentFrame = animationHandler->animations[animationHandler->currentAnimation]->head; + *(animationHandler->spriteTexture) = animationHandler->currentFrame->texture; } void AnimationChangeAnimation(AnimationHandler *animationHandler, int newAnimation){ @@ -40,5 +43,4 @@ void AnimationChangeAnimation(AnimationHandler *animationHandler, int newAnimati animationHandler->currentAnimation = newAnimation; AnimationReset(animationHandler); } - } diff --git a/Textures/animationHandler.h b/Textures/animationHandler.h index 739b868..1dbd414 100644 --- a/Textures/animationHandler.h +++ b/Textures/animationHandler.h @@ -9,14 +9,15 @@ typedef struct AnimationHandler AnimationHandler; typedef struct AnimationHandler{ Animation **animations; AnimationFrame *currentFrame; + Texture2D **spriteTexture; int currentAnimation; int forward; float deltaElapsed; } AnimationHandler; -AnimationHandler * AnimationHandlerInit(Animation **animations); +AnimationHandler * AnimationHandlerInit(Animation **animations, Texture2D **spriteTexture); void AnimationUpdate(AnimationHandler *animationHandler); void AnimationReset(AnimationHandler *animationHandler); void AnimationChangeAnimation(AnimationHandler *animationHandler, int newAnimation); -#endif \ No newline at end of file +#endif diff --git a/Textures/textureIDs.h b/Textures/textureIDs.h deleted file mode 100644 index 5a60e99..0000000 --- a/Textures/textureIDs.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef TEXTUREIDS_H_ -#define TEXTUREIDS_H_ - -#define N 0 -#define NE 1 -#define E 3 -#define SE 5 -#define S 7 -#define SW 6 -#define W 4 -#define NW 2 - -#define TE_cursor 0 -#define TE_worker 1 -#define TE_building 2 -#define TE_baustelle 3 - -#endif diff --git a/Textures/textureatlas.c b/Textures/textureatlas.c index d35e157..48f15dd 100644 --- a/Textures/textureatlas.c +++ b/Textures/textureatlas.c @@ -41,6 +41,20 @@ TextureAtlas * TextureAtlasInit(){ return textures; } +void TextureAtlasLoadTextures(TextureAtlas *atlas){ + int i; + for(i = 0; i < TE_AMOUNT; i++){ + switch(i){ + case TE_CURSOR: + //Laden + break; + case TE_WORKER: + // Laden + break; + } + } +} + void LoadCursorTextures(Texture2D *cursorTextures, Animation **cursorAnimation){ *cursorTextures = LoadTexture("assets/cursor.gif"); *(cursorTextures + 1) = LoadTexture("assets/cursor_down.gif"); diff --git a/Textures/textureatlas.h b/Textures/textureatlas.h index abecee1..5e268a2 100644 --- a/Textures/textureatlas.h +++ b/Textures/textureatlas.h @@ -2,10 +2,14 @@ #define TEXTUREATLAS_H_ #include "raylib.h" #include "animation.h" +#include "../definitions.h" typedef struct TextureAtlas TextureAtlas; typedef struct TextureAtlas{ + + Texture2D *textures[TE_AMOUNT]; + Texture2D cursorTextures[2]; Animation *cursorAnimation[1]; @@ -17,12 +21,11 @@ typedef struct TextureAtlas{ Texture2D baustelle; Animation *baustelleAnimation[8]; - - //Texture2D[] mapTextures; } TextureAtlas; // Initialize the full TextureAtlas struct with all Textures used in the game TextureAtlas * TextureAtlasInit(); +void TextureAtlasLoadTextures(TextureAtlas *atlas); void LoadCursorTextures(Texture2D *cursorTextures, Animation **cursorAnimation); void LoadWorkerTextures(Texture2D *workerTextures); void LoadWorkerAnimations(Animation **workerAnimations, Texture2D *workerTextures); diff --git a/assets/worker/die-0.png b/assets/entities/worker/die-0.png similarity index 100% rename from assets/worker/die-0.png rename to assets/entities/worker/die-0.png diff --git a/assets/worker/die-1.png b/assets/entities/worker/die-1.png similarity index 100% rename from assets/worker/die-1.png rename to assets/entities/worker/die-1.png diff --git a/assets/worker/die-10.png b/assets/entities/worker/die-10.png similarity index 100% rename from assets/worker/die-10.png rename to assets/entities/worker/die-10.png diff --git a/assets/worker/die-11.png b/assets/entities/worker/die-11.png similarity index 100% rename from assets/worker/die-11.png rename to assets/entities/worker/die-11.png diff --git a/assets/worker/die-12.png b/assets/entities/worker/die-12.png similarity index 100% rename from assets/worker/die-12.png rename to assets/entities/worker/die-12.png diff --git a/assets/worker/die-13.png b/assets/entities/worker/die-13.png similarity index 100% rename from assets/worker/die-13.png rename to assets/entities/worker/die-13.png diff --git a/assets/worker/die-14.png b/assets/entities/worker/die-14.png similarity index 100% rename from assets/worker/die-14.png rename to assets/entities/worker/die-14.png diff --git a/assets/worker/die-2.png b/assets/entities/worker/die-2.png similarity index 100% rename from assets/worker/die-2.png rename to assets/entities/worker/die-2.png diff --git a/assets/worker/die-3.png b/assets/entities/worker/die-3.png similarity index 100% rename from assets/worker/die-3.png rename to assets/entities/worker/die-3.png diff --git a/assets/worker/die-4.png b/assets/entities/worker/die-4.png similarity index 100% rename from assets/worker/die-4.png rename to assets/entities/worker/die-4.png diff --git a/assets/worker/die-5.png b/assets/entities/worker/die-5.png similarity index 100% rename from assets/worker/die-5.png rename to assets/entities/worker/die-5.png diff --git a/assets/worker/die-6.png b/assets/entities/worker/die-6.png similarity index 100% rename from assets/worker/die-6.png rename to assets/entities/worker/die-6.png diff --git a/assets/worker/die-7.png b/assets/entities/worker/die-7.png similarity index 100% rename from assets/worker/die-7.png rename to assets/entities/worker/die-7.png diff --git a/assets/worker/die-8.png b/assets/entities/worker/die-8.png similarity index 100% rename from assets/worker/die-8.png rename to assets/entities/worker/die-8.png diff --git a/assets/worker/die-9.png b/assets/entities/worker/die-9.png similarity index 100% rename from assets/worker/die-9.png rename to assets/entities/worker/die-9.png diff --git a/assets/worker/die.png b/assets/entities/worker/die.png similarity index 100% rename from assets/worker/die.png rename to assets/entities/worker/die.png diff --git a/assets/worker/umackern-0.png b/assets/entities/worker/umackern-0.png similarity index 100% rename from assets/worker/umackern-0.png rename to assets/entities/worker/umackern-0.png diff --git a/assets/worker/umackern-1.png b/assets/entities/worker/umackern-1.png similarity index 100% rename from assets/worker/umackern-1.png rename to assets/entities/worker/umackern-1.png diff --git a/assets/worker/umackern-10.png b/assets/entities/worker/umackern-10.png similarity index 100% rename from assets/worker/umackern-10.png rename to assets/entities/worker/umackern-10.png diff --git a/assets/worker/umackern-11.png b/assets/entities/worker/umackern-11.png similarity index 100% rename from assets/worker/umackern-11.png rename to assets/entities/worker/umackern-11.png diff --git a/assets/worker/umackern-12.png b/assets/entities/worker/umackern-12.png similarity index 100% rename from assets/worker/umackern-12.png rename to assets/entities/worker/umackern-12.png diff --git a/assets/worker/umackern-13.png b/assets/entities/worker/umackern-13.png similarity index 100% rename from assets/worker/umackern-13.png rename to assets/entities/worker/umackern-13.png diff --git a/assets/worker/umackern-14.png b/assets/entities/worker/umackern-14.png similarity index 100% rename from assets/worker/umackern-14.png rename to assets/entities/worker/umackern-14.png diff --git a/assets/worker/umackern-15.png b/assets/entities/worker/umackern-15.png similarity index 100% rename from assets/worker/umackern-15.png rename to assets/entities/worker/umackern-15.png diff --git a/assets/worker/umackern-16.png b/assets/entities/worker/umackern-16.png similarity index 100% rename from assets/worker/umackern-16.png rename to assets/entities/worker/umackern-16.png diff --git a/assets/worker/umackern-17.png b/assets/entities/worker/umackern-17.png similarity index 100% rename from assets/worker/umackern-17.png rename to assets/entities/worker/umackern-17.png diff --git a/assets/worker/umackern-18.png b/assets/entities/worker/umackern-18.png similarity index 100% rename from assets/worker/umackern-18.png rename to assets/entities/worker/umackern-18.png diff --git a/assets/worker/umackern-19.png b/assets/entities/worker/umackern-19.png similarity index 100% rename from assets/worker/umackern-19.png rename to assets/entities/worker/umackern-19.png diff --git a/assets/worker/umackern-2.png b/assets/entities/worker/umackern-2.png similarity index 100% rename from assets/worker/umackern-2.png rename to assets/entities/worker/umackern-2.png diff --git a/assets/worker/umackern-20.png b/assets/entities/worker/umackern-20.png similarity index 100% rename from assets/worker/umackern-20.png rename to assets/entities/worker/umackern-20.png diff --git a/assets/worker/umackern-21.png b/assets/entities/worker/umackern-21.png similarity index 100% rename from assets/worker/umackern-21.png rename to assets/entities/worker/umackern-21.png diff --git a/assets/worker/umackern-22.png b/assets/entities/worker/umackern-22.png similarity index 100% rename from assets/worker/umackern-22.png rename to assets/entities/worker/umackern-22.png diff --git a/assets/worker/umackern-23.png b/assets/entities/worker/umackern-23.png similarity index 100% rename from assets/worker/umackern-23.png rename to assets/entities/worker/umackern-23.png diff --git a/assets/worker/umackern-24.png b/assets/entities/worker/umackern-24.png similarity index 100% rename from assets/worker/umackern-24.png rename to assets/entities/worker/umackern-24.png diff --git a/assets/worker/umackern-3.png b/assets/entities/worker/umackern-3.png similarity index 100% rename from assets/worker/umackern-3.png rename to assets/entities/worker/umackern-3.png diff --git a/assets/worker/umackern-4.png b/assets/entities/worker/umackern-4.png similarity index 100% rename from assets/worker/umackern-4.png rename to assets/entities/worker/umackern-4.png diff --git a/assets/worker/umackern-5.png b/assets/entities/worker/umackern-5.png similarity index 100% rename from assets/worker/umackern-5.png rename to assets/entities/worker/umackern-5.png diff --git a/assets/worker/umackern-6.png b/assets/entities/worker/umackern-6.png similarity index 100% rename from assets/worker/umackern-6.png rename to assets/entities/worker/umackern-6.png diff --git a/assets/worker/umackern-7.png b/assets/entities/worker/umackern-7.png similarity index 100% rename from assets/worker/umackern-7.png rename to assets/entities/worker/umackern-7.png diff --git a/assets/worker/umackern-8.png b/assets/entities/worker/umackern-8.png similarity index 100% rename from assets/worker/umackern-8.png rename to assets/entities/worker/umackern-8.png diff --git a/assets/worker/umackern-9.png b/assets/entities/worker/umackern-9.png similarity index 100% rename from assets/worker/umackern-9.png rename to assets/entities/worker/umackern-9.png diff --git a/assets/worker/umackern.png b/assets/entities/worker/umackern.png similarity index 100% rename from assets/worker/umackern.png rename to assets/entities/worker/umackern.png diff --git a/assets/worker/walk-0.png b/assets/entities/worker/walk-0.png similarity index 100% rename from assets/worker/walk-0.png rename to assets/entities/worker/walk-0.png diff --git a/assets/worker/walk-1.png b/assets/entities/worker/walk-1.png similarity index 100% rename from assets/worker/walk-1.png rename to assets/entities/worker/walk-1.png diff --git a/assets/worker/walk-10.png b/assets/entities/worker/walk-10.png similarity index 100% rename from assets/worker/walk-10.png rename to assets/entities/worker/walk-10.png diff --git a/assets/worker/walk-11.png b/assets/entities/worker/walk-11.png similarity index 100% rename from assets/worker/walk-11.png rename to assets/entities/worker/walk-11.png diff --git a/assets/worker/walk-12.png b/assets/entities/worker/walk-12.png similarity index 100% rename from assets/worker/walk-12.png rename to assets/entities/worker/walk-12.png diff --git a/assets/worker/walk-13.png b/assets/entities/worker/walk-13.png similarity index 100% rename from assets/worker/walk-13.png rename to assets/entities/worker/walk-13.png diff --git a/assets/worker/walk-14.png b/assets/entities/worker/walk-14.png similarity index 100% rename from assets/worker/walk-14.png rename to assets/entities/worker/walk-14.png diff --git a/assets/worker/walk-15.png b/assets/entities/worker/walk-15.png similarity index 100% rename from assets/worker/walk-15.png rename to assets/entities/worker/walk-15.png diff --git a/assets/worker/walk-16.png b/assets/entities/worker/walk-16.png similarity index 100% rename from assets/worker/walk-16.png rename to assets/entities/worker/walk-16.png diff --git a/assets/worker/walk-17.png b/assets/entities/worker/walk-17.png similarity index 100% rename from assets/worker/walk-17.png rename to assets/entities/worker/walk-17.png diff --git a/assets/worker/walk-18.png b/assets/entities/worker/walk-18.png similarity index 100% rename from assets/worker/walk-18.png rename to assets/entities/worker/walk-18.png diff --git a/assets/worker/walk-19.png b/assets/entities/worker/walk-19.png similarity index 100% rename from assets/worker/walk-19.png rename to assets/entities/worker/walk-19.png diff --git a/assets/worker/walk-2.png b/assets/entities/worker/walk-2.png similarity index 100% rename from assets/worker/walk-2.png rename to assets/entities/worker/walk-2.png diff --git a/assets/worker/walk-20.png b/assets/entities/worker/walk-20.png similarity index 100% rename from assets/worker/walk-20.png rename to assets/entities/worker/walk-20.png diff --git a/assets/worker/walk-21.png b/assets/entities/worker/walk-21.png similarity index 100% rename from assets/worker/walk-21.png rename to assets/entities/worker/walk-21.png diff --git a/assets/worker/walk-22.png b/assets/entities/worker/walk-22.png similarity index 100% rename from assets/worker/walk-22.png rename to assets/entities/worker/walk-22.png diff --git a/assets/worker/walk-23.png b/assets/entities/worker/walk-23.png similarity index 100% rename from assets/worker/walk-23.png rename to assets/entities/worker/walk-23.png diff --git a/assets/worker/walk-24.png b/assets/entities/worker/walk-24.png similarity index 100% rename from assets/worker/walk-24.png rename to assets/entities/worker/walk-24.png diff --git a/assets/worker/walk-3.png b/assets/entities/worker/walk-3.png similarity index 100% rename from assets/worker/walk-3.png rename to assets/entities/worker/walk-3.png diff --git a/assets/worker/walk-4.png b/assets/entities/worker/walk-4.png similarity index 100% rename from assets/worker/walk-4.png rename to assets/entities/worker/walk-4.png diff --git a/assets/worker/walk-5.png b/assets/entities/worker/walk-5.png similarity index 100% rename from assets/worker/walk-5.png rename to assets/entities/worker/walk-5.png diff --git a/assets/worker/walk-6.png b/assets/entities/worker/walk-6.png similarity index 100% rename from assets/worker/walk-6.png rename to assets/entities/worker/walk-6.png diff --git a/assets/worker/walk-7.png b/assets/entities/worker/walk-7.png similarity index 100% rename from assets/worker/walk-7.png rename to assets/entities/worker/walk-7.png diff --git a/assets/worker/walk-8.png b/assets/entities/worker/walk-8.png similarity index 100% rename from assets/worker/walk-8.png rename to assets/entities/worker/walk-8.png diff --git a/assets/worker/walk-9.png b/assets/entities/worker/walk-9.png similarity index 100% rename from assets/worker/walk-9.png rename to assets/entities/worker/walk-9.png diff --git a/assets/worker/walk.png b/assets/entities/worker/walk.png similarity index 100% rename from assets/worker/walk.png rename to assets/entities/worker/walk.png diff --git a/assets/worker/worker.png b/assets/entities/worker/worker.png similarity index 100% rename from assets/worker/worker.png rename to assets/entities/worker/worker.png diff --git a/definitions.h b/definitions.h new file mode 100644 index 0000000..ce3c322 --- /dev/null +++ b/definitions.h @@ -0,0 +1,22 @@ +#ifndef DEFINITIONS_H_ +#define DEFINITIONS_H_ + +#define N 0 +#define NE 1 +#define E 3 +#define SE 5 +#define S 7 +#define SW 6 +#define W 4 +#define NW 2 + +#define TE_CURSOR 0 +#define TE_WORKER 1 +#define TE_BUILDING 2 +#define TE_BAUSTELLE 3 + +#define TE_AMOUNT 4 +#define TE_ENTITY_LENGTH 104 +#define TE_MAPOBJECT_LENGTH 1 + +#endif