Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-07 13:38:11 +0000
committerStijn Buys <ingar@osirion.org>2013-11-07 13:38:11 +0000
commit4896428eefa6e621523168a42dceda4f8f2b0097 (patch)
tree4b2d183b9d9f4054326f4fede778f05c0d2a9659 /src/core/entity.cc
parent66746168f710cfdfbb0853947985fa0c552e81fb (diff)
Added core:: support for entity factions and player reputation (single-player only).
Diffstat (limited to 'src/core/entity.cc')
-rw-r--r--src/core/entity.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 89c78d8..89e494a 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -165,6 +165,8 @@ Entity::Entity() :
entity_inventory = 0;
entity_slots = 0;
entity_info = 0;
+
+ entity_faction = 0;
memset(entity_extension, 0, sizeof(entity_extension));
@@ -193,6 +195,8 @@ Entity::Entity(std::istream & is)
entity_inventory = 0;
entity_slots = 0;
entity_info = 0;
+
+ entity_faction = 0;
memset(entity_extension, 0, sizeof(entity_extension));
}
@@ -1070,6 +1074,7 @@ void EntityControlable::ActionInterface::debugDraw(btIDebugDraw* debugDrawer)
/*----- EntityControlable ------------------------------------------ */
+// server-side constructor
EntityControlable::EntityControlable() : EntityDynamic()
{
entity_thrust = 0;
@@ -1088,6 +1093,7 @@ EntityControlable::EntityControlable() : EntityDynamic()
entity_health = 100.0f;
}
+// client-side constructor
EntityControlable::EntityControlable(std::istream & is) :
EntityDynamic(is)
{