summaryrefslogtreecommitdiff
path: root/src/scripting
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-09-08 11:42:33 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-09-08 11:42:33 +0200
commit434d3f97489094f3f7897bce0942cd3c46483c9f (patch)
tree3a9a21735e8fbfde4c0050da3e46a3f1fa9753bb /src/scripting
parentf712d68495dd8e040c32da3b1c85bcb7845543ec (diff)
downloadmanaserv-434d3f97489094f3f7897bce0942cd3c46483c9f.tar.gz
manaserv-434d3f97489094f3f7897bce0942cd3c46483c9f.tar.bz2
manaserv-434d3f97489094f3f7897bce0942cd3c46483c9f.tar.xz
manaserv-434d3f97489094f3f7897bce0942cd3c46483c9f.zip
Renamed character.cpp to charactercomponent.cpp
Now we do not have two character.cpp files in the repository.
Diffstat (limited to 'src/scripting')
-rw-r--r--src/scripting/lua.cpp2
-rw-r--r--src/scripting/luascript.cpp2
-rw-r--r--src/scripting/luautil.cpp2
-rw-r--r--src/scripting/scriptmanager.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index 50bf3f35..0e58f52b 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -31,7 +31,7 @@ extern "C" {
#include "common/resourcemanager.h"
#include "game-server/accountconnection.h"
#include "game-server/buysell.h"
-#include "game-server/character.h"
+#include "game-server/charactercomponent.h"
#include "game-server/collisiondetection.h"
#include "game-server/effect.h"
#include "game-server/gamehandler.h"
diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp
index 6d22774a..42a78955 100644
--- a/src/scripting/luascript.cpp
+++ b/src/scripting/luascript.cpp
@@ -24,7 +24,7 @@
#include "scripting/luautil.h"
#include "scripting/scriptmanager.h"
-#include "game-server/character.h"
+#include "game-server/charactercomponent.h"
#include "utils/logger.h"
#include <cassert>
diff --git a/src/scripting/luautil.cpp b/src/scripting/luautil.cpp
index ed277ee0..d3db13f2 100644
--- a/src/scripting/luautil.cpp
+++ b/src/scripting/luautil.cpp
@@ -23,7 +23,7 @@
#include <string.h>
-#include "game-server/character.h"
+#include "game-server/charactercomponent.h"
#include "game-server/itemmanager.h"
#include "game-server/monster.h"
#include "game-server/monstermanager.h"
diff --git a/src/scripting/scriptmanager.h b/src/scripting/scriptmanager.h
index 691acec6..293b1dab 100644
--- a/src/scripting/scriptmanager.h
+++ b/src/scripting/scriptmanager.h
@@ -21,7 +21,7 @@
#ifndef SCRIPTMANAGER_H
#define SCRIPTMANAGER_H
-#include "game-server/character.h"
+#include "game-server/charactercomponent.h"
#include <string>