Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-03-05 18:21:39 +0000
committerStijn Buys <ingar@osirion.org>2008-03-05 18:21:39 +0000
commit4f6b27b58bfae9ce860a005edf890d8f1136a85f (patch)
treea3b4f7b108173d8cba0df0c66768d0a9ebf61047 /src/game
parentc326c5d31e710cd22f4d5047252da2bfc77da1f1 (diff)
OpenGL lighting
Diffstat (limited to 'src/game')
-rw-r--r--src/game/game.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game/game.cc b/src/game/game.cc
index da8ef2e..77e534f 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -120,7 +120,7 @@ void Game::init()
cube->entity_modelname = "cube";
cube->entity_moduletypeid = cube_enttype;
- // Thornaider
+ // Canasta
cube = new core::Entity(core::Entity::Solid & core::Entity::Static);
cube->entity_shape = core::Entity::Diamond;
cube->entity_color = Color(0.5f, 1.0f, 5.0f);
@@ -132,10 +132,16 @@ void Game::init()
cube = new core::Entity(core::Entity::Solid & core::Entity::Static);
cube->entity_shape = core::Entity::Diamond;
cube->entity_color = Color(0.5f, 1.0f, 5.0f);
- cube->entity_location = Vector3f(18.0f, 22.0f, 0.0f);
+ cube->entity_location = Vector3f(17.0f, 21.0f, 0.0f);
cube->entity_name = "wreck: Micron Vector";
cube->entity_modelname = "ships/micron_vector";
+ // Alexandria
+ core::Entity *alexandria = new core::Entity(core::Entity::Solid & core::Entity::Static);
+ alexandria->entity_location = Vector3f(0.0f, -64.0f, 0.0f);
+ alexandria->entity_name = "station: Alexandria";
+ alexandria->entity_modelname = "stations/alexandria";
+
// the yellow sphere
core::Entity *sphere = new core::Entity(core::Entity::Solid & core::Entity::Static);
sphere->entity_shape = core::Entity::Sphere;