Lots of updates - lua, narrator, logic, models

src/gamedata/GameData.cpp

@@ -9,6 +9,8 @@
 #include "GUIModule.h"
 #include "LuaData.h"
 #include "WorldMapModule.h"
+#include "BoatModule.h"
+#include "EventTriggerModule.h"
 
 namespace ECS
 {
@@ -43,6 +45,9 @@ void setup(Ogre::SceneManager *scnMgr, Ogre::Bullet::DynamicsWorld *world,
 	ecs.import <LuaModule>();
 	ecs.import <WorldMapModule>();
 	ecs.import <LuaModule>();
+	ecs.import <BoatModule>();
+	ecs.import <EventTriggerModule>();
+
 	ecs.system<EngineData>("UpdateDelta")
 		.kind(flecs::OnUpdate)
 		.each([](EngineData &eng) {
@@ -95,19 +100,7 @@ void setup(Ogre::SceneManager *scnMgr, Ogre::Bullet::DynamicsWorld *world,
 	player = ecs.entity("player");
 	Ogre::Vector3 playerPos(0, 0, 4);
 	player.set<CharacterLocation>({ { 0, 0, 0, 1 }, playerPos });
-	player.set<AnimationControl>({ AnimationControl::ANIM_NONE,
-				       AnimationControl::ANIM_NONE, false,
-				       false });
-	player.set<CharacterBase>({ "normal-male.glb",
-				    0.0f,
-				    nullptr,
-				    nullptr,
-				    nullptr,
-				    nullptr,
-				    { 0, 0, 0 },
-				    { 0, 0, 0 },
-				    false });
-	player.set<CharacterBody>({ nullptr, nullptr, nullptr, false, false });
+	player.set<CharacterConf>({ "normal-male.glb" });
 	player.add<Character>();
 	player.add<Player>();
 }