diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/UIClass.h | 1 | ||||
| -rw-r--r-- | include/World.h | 6 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/entities.h | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/include/UIClass.h b/include/UIClass.h index e6f4825..9bf301c 100644 --- a/include/UIClass.h +++ b/include/UIClass.h @@ -16,6 +16,7 @@ public: void msgBox(const char *str,...);
void handleEvents();
int mousex, mousey;
+ bool debug = false;
};
#endif // UICLASS_H
diff --git a/include/World.h b/include/World.h index fca108d..7d9224e 100644 --- a/include/World.h +++ b/include/World.h @@ -4,7 +4,7 @@ #include <common.h>
// Total amount of entities that can be bound to a layer
-#define MAX_ENTITIES 16
+#define MAX_ENTITIES 32
// Easy shortcuts used in UIClass
#define goWorldLeft(w) if(w->toLeft){w=w->toLeft;}
@@ -18,7 +18,7 @@ private: } __attribute__ ((packed)) *line;
unsigned int lineCount; // Size of line array, calculated in the constructor
unsigned int entCount; // Count of currently bound entities
- void *entity[MAX_ENTITIES];
+ void **entity;
public:
World *behind,*infront; // As in layers
World *toLeft,*toRight; // 'new' worlds (off screen)
@@ -31,4 +31,4 @@ public: void addEntity(void *e); // Adds (binds) an entity to the world
};
-#endif // WORLD_H +#endif // WORLD_H
diff --git a/include/common.h b/include/common.h index 290e47a..bddb1b3 100644 --- a/include/common.h +++ b/include/common.h @@ -7,6 +7,7 @@ typedef struct{float x; float y;}vec2; #include <iostream> #include <cstdlib> +#include <math.h> #include <SDL2/SDL.h> #include <SDL2/SDL_image.h> #include <SDL2/SDL_opengl.h> diff --git a/include/entities.h b/include/entities.h index 7d5e356..bc277cd 100644 --- a/include/entities.h +++ b/include/entities.h @@ -16,6 +16,8 @@ public: bool right,left, canMove; bool alive; + unsigned int texture[]; + void spawn(float, float); void draw(void); void wander(int, vec2*); |