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>2012-12-28 22:53:10 +0000
committerStijn Buys <ingar@osirion.org>2012-12-28 22:53:10 +0000
commitfe96eee5db2acbef1ea0f360b180fd9f8f990444 (patch)
treee4c2c65b20ca652861a30fa6b73673e73a07bb59 /src/core/entityglobe.cc
parent92dafc75bba246aed3f20a558a9c4eed13a1e8a9 (diff)
Addedd core:: support for EntityGlobe rings.
Diffstat (limited to 'src/core/entityglobe.cc')
-rw-r--r--src/core/entityglobe.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/entityglobe.cc b/src/core/entityglobe.cc
index c27e05c..df12f66 100644
--- a/src/core/entityglobe.cc
+++ b/src/core/entityglobe.cc
@@ -17,18 +17,24 @@ namespace core
EntityGlobe::EntityGlobe() : Entity()
{
+ set_shape(Sphere);
+
entity_texture_id = 0;
entity_corona_id = 0;
+ entity_rings_id = 0;
+
entity_rotationspeed = 0;
- set_shape(Sphere);
}
EntityGlobe::EntityGlobe(std::istream & is) : Entity(is)
{
+ set_shape(Sphere);
+
entity_texture_id = 0;
entity_corona_id = 0;
+ entity_rings_id = 0;
+
entity_rotationspeed = 0;
- set_shape(Sphere);
}
EntityGlobe::~EntityGlobe()
@@ -38,7 +44,9 @@ EntityGlobe::~EntityGlobe()
void EntityGlobe::serialize_server_create(std::ostream & os) const
{
Entity::serialize_server_create(os);
- os << entity_rotationspeed << " \"" << texturename() << "\" \"" << coronaname() << "\" ";
+ os << entity_rotationspeed << " ";
+ os << "\"" << texturename() << "\" ";
+ os << "\"" << coronaname() << "\" ";
}
void EntityGlobe::receive_server_create(std::istream &is)