Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-08-15 14:03:22 +0000
committerStijn Buys <ingar@osirion.org>2008-08-15 14:03:22 +0000
commit8a4eb790261737104be262cdeab4b0e7d0f5566d (patch)
tree506c094bda41d934fae5bdb7d253c147c1d62964 /src/model
parent62de0496836e729ff955274cf153914709775bfb (diff)
render dock locations on active targets, fix star texture loading and rendering
Diffstat (limited to 'src/model')
-rw-r--r--src/model/dock.cc2
-rw-r--r--src/model/dock.h2
-rw-r--r--src/model/map.cc1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/model/dock.cc b/src/model/dock.cc
index b850722..bdc63e3 100644
--- a/src/model/dock.cc
+++ b/src/model/dock.cc
@@ -10,7 +10,7 @@ namespace model {
Dock::Dock()
{
- dock_radius = 1.0f;
+ dock_radius = 0.01f;
}
Dock::~Dock()
diff --git a/src/model/dock.h b/src/model/dock.h
index 0ad2738..89a4026 100644
--- a/src/model/dock.h
+++ b/src/model/dock.h
@@ -26,7 +26,7 @@ public:
return dock_location;
}
- /// trigger distance in game units, default is 1.0f
+ /// trigger distance default is 0.01f
inline float radius() const
{
return dock_radius;
diff --git a/src/model/map.cc b/src/model/map.cc
index d138b49..6494cd7 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -885,6 +885,7 @@ Model * Map::load(std::string const &name)
continue;
} else if (mapfile.got_key_float("radius", dock->dock_radius)) {
+ dock->dock_radius /= 100.0f;
continue;
}