Added sound effects for weapon mounting and target hitting,

enabled projectile soundname transfer in networked games,
resolved an issue where a ship was able to shoot itself,
bumped network protocol to 26,

1 files changed, 7 insertions, 5 deletions

diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 1be0b77..a44650b 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -1024,14 +1024,14 @@ 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_owner_id(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());
 		spacemine->set_zone(ship->zone());
 		
 		player->send(weapon->name() + " ejected");
-		player->sound("fx/eject");
+		player->sound("game/eject");
 		
 		spacemine->reset();
 		
@@ -1104,7 +1104,7 @@ void Game::func_eject(core::Player *player, const std::string &args)
 			std::stringstream msgstr;
 			msgstr << "^BDestroyed " << amount << " " << aux::plural("unit", amount) << " of " << item->info()->name();
 			ejector->owner()->send(msgstr.str());
-			ejector->owner()->sound("fx/eject");
+			ejector->owner()->sound("game/eject");
 		}
 	} else {	
 		// create cargo pod	
@@ -1140,7 +1140,7 @@ void Game::func_eject(core::Player *player, const std::string &args)
 				msgstr << "^BEjected " << amount << " " << aux::plural("unit", amount) << " of " << item->info()->name();
 			}
 			ejector->owner()->send(msgstr.str());
-			ejector->owner()->sound("fx/eject");
+			ejector->owner()->sound("game/eject");
 		}
 		
 		pod->reset();
@@ -1236,6 +1236,7 @@ void Game::func_mount(core::Player *player, const std::string &args)
 				std::stringstream msgstr;
 				msgstr << "^BUnmounted " << weapon->name();
 				ship->owner()->send(msgstr.str());
+				player->sound("game/unmount");
 			}
 		}
 		
@@ -1267,6 +1268,7 @@ void Game::func_mount(core::Player *player, const std::string &args)
 				std::stringstream msgstr;
 				msgstr << "^BMounted " << weapon->name();
 				ship->owner()->send(msgstr.str());
+				player->sound("game/mount");
 			}
 		}
 	}
@@ -1333,7 +1335,7 @@ void Game::func_beam(core::Player *player, const std::string &args)
 					msgstr << "^BBeamed in " << negotiated_amount << " " << aux::plural("unit", negotiated_amount) << " of " << item->info()->name();
 					player->send(msgstr.str());	
 					// TODO sound must be emitted at cargo pod location
-					player->sound("fx/beam");
+					player->sound("game/beam");
 				}
 				
 				loot_left += item->amount();