diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-03-02 22:55:30 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-03-02 22:55:30 +0000 |
| commit | e379b1bfeb231716e07f0e4ae9ef024be9bfd08f (patch) | |
| tree | 6258754959e820a9a94726a4b1a119c301581111 /src/game | |
| parent | 6e08b92bd4f3e32fdf550f0a3e950e3101a1b06f (diff) | |
added target_engine support
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/game.cc | 6 | ||||
| -rw-r--r-- | src/game/ship.cc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/game/game.cc b/src/game/game.cc index 828a35b..4aa505d 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -101,8 +101,8 @@ void Game::init() cube->entity_shape = core::Entity::Diamond; cube->entity_color = Color(0.5f, 1.0f, 5.0f); cube->entity_location = Vector3f(16.0f, 20.0f, 0.0f); - cube->entity_name = "wreck: Thornaider"; - cube->entity_modelname = "ship"; + cube->entity_name = "wreck: Canasta"; + cube->entity_modelname = "ships/canasta"; // Micron Vector cube = new core::Entity(core::Entity::Solid & core::Entity::Static); @@ -110,7 +110,7 @@ void Game::init() cube->entity_color = Color(0.5f, 1.0f, 5.0f); cube->entity_location = Vector3f(18.0f, 22.0f, 0.0f); cube->entity_name = "wreck: Micron Vector"; - cube->entity_modelname = "micron_vector"; + cube->entity_modelname = "ships/micron_vector"; // the yellow sphere core::Entity *sphere = new core::Entity(core::Entity::Solid & core::Entity::Static); diff --git a/src/game/ship.cc b/src/game/ship.cc index e2a42d8..37c8cd8 100644 --- a/src/game/ship.cc +++ b/src/game/ship.cc @@ -23,6 +23,7 @@ Ship::Ship(core::Player *owner) : // entity properties entity_name = "ship: <" + owner->name() + "> Micron Vector"; entity_owner = owner; + entity_modelname = "ships/micron_vector"; // ship specs acceleration = 1.5f; |