Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/base/game.cc2
-rw-r--r--src/game/base/ship.cc2
-rw-r--r--src/game/intro/convoy.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 50ec416..48e1b05 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -684,7 +684,7 @@ bool Game::load_menus(core::Entity *entity, const std::string &menufilename)
button = new ButtonDescription();
button->set_text("buy " + model->name());
button->set_command("buy " + model->label());
- button->set_modelname("ships/" + model->modelname());
+ button->set_modelname(model->modelname());
button->set_alignment(ButtonDescription::Left);
menu_dealer->add_button(button);
}
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 3071bb7..7735aa1 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -26,7 +26,7 @@ const float MIN_DELTA = 0.000001f;
Ship::Ship(core::Player *owner, ShipModel *shipmodel) :
core::EntityControlable(owner, ship_enttype)
{
- set_modelname("ships/" + shipmodel->modelname());
+ set_modelname(shipmodel->modelname());
set_name(shipmodel->name() + ": <^B" + owner->name() + "^N>");
set_label(shipmodel->label());
diff --git a/src/game/intro/convoy.cc b/src/game/intro/convoy.cc
index c0fba52..3421538 100644
--- a/src/game/intro/convoy.cc
+++ b/src/game/intro/convoy.cc
@@ -16,7 +16,7 @@ Member::Member(std::string const &model) : core::EntityControlable(0, 1)
set_name("Convoy member");
set_label(model);
- set_modelname("ships/" + model);
+ set_modelname(model);
entity_thrust = 1.0f;
/*