- Treballant, canvi de comp, ara peta

source/actor.h

@@ -3,6 +3,8 @@
 #include "misc.h"
 #include "jdraw.h"
 
+#include <string>
+
 #define FLAG_NONE       0
 #define FLAG_HERO       1
 #define FLAG_PUSHABLE   2
@@ -35,9 +37,9 @@ namespace actor
 {
     struct actor_t
     {
-        char            name[16];
+        std::string     name;
         draw::surface   *surface;
-        char            bmp[16];
+        std::string     bmp;
         SDL_Rect        bmp_rect;
         SDL_Point       bmp_offset;
 
@@ -70,7 +72,7 @@ namespace actor
 
     actor_t *getSelected();
 
-    actor_t *create(const char *name, vec3_t p, vec3_t s, const char *bmp, SDL_Rect r, SDL_Point o);
+    actor_t *create(std::string name, vec3_t p, vec3_t s, std::string bmp, SDL_Rect r, SDL_Point o);
 
     void setDirty(actor_t *act, const bool force=false);
 
@@ -82,7 +84,7 @@ namespace actor
 
     void draw(actor_t *act, const bool draw_all=true);
 
-    actor_t *find(const char *name);
+    actor_t *find(std::string name);
 
     actor_t *find_at(const int x, const int y, const int z);
 
@@ -90,5 +92,7 @@ namespace actor
 
     const bool check_collision(actor_t *obj1, actor_t *obj2);
 
+    void remove(actor_t *act);
+    
     void clear();
 }