Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/game.cc')
-rw-r--r--src/game/game.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/game/game.cc b/src/game/game.cc
index 5157270..cf9f496 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -83,8 +83,8 @@ void Game::init()
cube->entity_shape = core::Entity::Cube;
cube->entity_color = Color(0.0f, 0.8f, 0.0f);
cube->entity_location = Vector3f(24.0f, 0.0f, -24.0f);
- cube->entity_name ="cube: Borg cube green";
- cube->entity_modelname = "cube";
+ cube->entity_name ="ccube: Borg cube green";
+ cube->entity_modelname = "ccube";
cube->entity_moduletypeid = cube_enttype;
// the red cube
@@ -96,6 +96,14 @@ void Game::init()
cube->entity_modelname = "cube";
cube->entity_moduletypeid = cube_enttype;
+ // diamond
+ 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(16.0f, 0.0f, -20.0f);
+ cube->entity_name = "diamond: big bucks";
+ cube->entity_modelname = "ship";
+
// the yellow sphere
core::Entity *sphere = new core::Entity(core::Entity::Solid & core::Entity::Static);
sphere->entity_shape = core::Entity::Sphere;