Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/zone.cc2
-rw-r--r--src/core/zone.h16
2 files changed, 2 insertions, 16 deletions
diff --git a/src/core/zone.cc b/src/core/zone.cc
index 7fc3f4d..3791b93 100644
--- a/src/core/zone.cc
+++ b/src/core/zone.cc
@@ -120,7 +120,6 @@ Zone::Zone(std::string const & label)
{
zone_id = 0;
zone_sky.clear();
- zone_sky_texture = 0;
zone_defaultview = 0;
set_label(label);
@@ -129,7 +128,6 @@ Zone::Zone(std::string const & label)
Zone::Zone(std::istream & is)
{
zone_id = 0;
- zone_sky_texture = 0;
receive_server_update(is);
}
diff --git a/src/core/zone.h b/src/core/zone.h
index c96f7f9..38a9298 100644
--- a/src/core/zone.h
+++ b/src/core/zone.h
@@ -85,16 +85,11 @@ public:
return zone_id;
}
- /// the name of the texture to be used as sky for this zone
+ /// name of the skybox
inline std::string const & sky() const {
return zone_sky;
}
- /// texture id for the sky
- inline size_t sky_texture() const {
- return zone_sky_texture;
- }
-
/// default zone view
inline Entity *default_view() {
return zone_defaultview;
@@ -114,16 +109,11 @@ public:
/* ---- mutators ------------------------------------------- */
- /// set the sky texture name to be used for this zone
+ /// set the skybox name
inline void set_sky(std::string const & sky) {
zone_sky.assign(sky);
}
- /// set the texture id for the sky
- inline void set_sky_texture(size_t texture) {
- zone_sky_texture = texture;
- }
-
///set the default view
inline void set_default_view(Entity *entity) {
zone_defaultview = entity;
@@ -155,8 +145,6 @@ private:
std::string zone_sky;
- size_t zone_sky_texture;
-
Content zone_content;
static Registry zone_registry;