Fix object graphic.

uspgamedev · Feb 10, 2015 · c343ba6 · c343ba6
1 parent a4c1649
commit c343ba6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/frontend/gameview/objectgraphic.cc b/src/frontend/gameview/objectgraphic.cc
@@ -37,7 +37,7 @@ namespace {
     std::forward_list<std::size_t> avaiable_indices_;
 }
 
-const std::vector<const ObjectGraphic*>& CurrentInstances() {
+const std::vector<const ObjectGraphic*>& ObjectGraphic::CurrentInstances() {
     return current_instances_vector_;
 }
 
@@ -119,7 +119,7 @@ namespace {
     }
 }
 
-ObjectGraphic* ObjectGraphic::Create(CreateTypes type, const std::string& arg) {
+ObjectGraphic* ObjectGraphic::Create(component::Graphic::CreateTypes type, const std::string& arg) {
     ObjectGraphic* g = new ObjectGraphic;
     CreateFunctions[static_cast<int>(type)](g->primitive_, arg);
     SetDefaultShader(g->primitive_);

diff --git a/src/frontend/gameview/objectgraphic.h b/src/frontend/gameview/objectgraphic.h
@@ -9,6 +9,7 @@
 #include <ugdk/graphic/primitive.h>
 #include <ugdk/graphic/visualeffect.h>
 #include <ugdk/graphic/primitivecontroller.h>
+#include "game/components/graphic.h"
 
 #include <string>
 #include <memory>
@@ -18,10 +19,7 @@ namespace gameview {
 
 class ObjectGraphic {
   public:
-    enum class CreateTypes {
-        SPECIALWALL
-    };
-    static ObjectGraphic* Create(CreateTypes, const std::string& arg);
+    static ObjectGraphic* Create(component::Graphic::CreateTypes, const std::string& arg);
 
     static ObjectGraphic* CreateWithSpritesheet(const std::string& spritesheet_name);
     static ObjectGraphic* CreateWithSingleFrame(const std::string& spritesheet_name, const std::string& frame_name);