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/base/game.cc')
-rw-r--r--src/game/base/game.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index a8a1aa2..2355a9e 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -1012,6 +1012,7 @@ void Game::func_drop(core::Player *player, const std::string &args)
SpaceMine *spacemine = new SpaceMine(weapon);
spacemine->set_color(ship->color());
+ spacemine->set_ownerid(player->id());
spacemine->set_color_second(ship->color_second());
spacemine->set_location(ship->location() + ship->axis().forward() * -1.0f * (ship->radius() + spacemine->radius()));
spacemine->set_axis(ship->axis());
@@ -1283,6 +1284,9 @@ void Game::func_respawn(core::Player *player, std::string const &args)
return;
}
+ // restore armor
+ ship->set_armor(ship->maxarmor());
+
core::Entity *spawn = ship->spawn();
if (!spawn) {
ship->set_zone(Default::zone);
@@ -1300,7 +1304,7 @@ void Game::func_respawn(core::Player *player, std::string const &args)
ship->set_state(core::Entity::Normal);
player->set_view(0);
player->send("^BRespawning");
- }
+ }
}