yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separated "raising" sounds for every tools

Browse Source
This commit is contained in:
yvt 2013-08-31 14:54:12 +09:00
parent 55dd4a259f
commit d7fb4456e9
3 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/PakLocation.txt
View File

@ -1,5 +1,6 @@
All paks for development vesion:
https://docs.google.com/file/d/0B-tOUTpujuYod2pCeWtGY2hXeWs/edit?usp=sharing
http://yvt.jp/files/programs/osppaks/DevPaks2.zip

59
Sources/Client/Client.cpp
View File

@ -548,7 +548,7 @@ namespace spades {
break;
}
}while(!world->GetLocalPlayer()->IsToolSelectable(t));
selectedTool = t;
SetSelectedTool(t);
}
if(selectedTool == player->GetTool()) {
toolRaiseState += dt * 4.f;
@ -940,25 +940,25 @@ namespace spades {
if(world->GetLocalPlayer()->GetTeamId() < 2 &&
world->GetLocalPlayer()->IsAlive() &&
world->GetLocalPlayer()->IsToolSelectable(Player::ToolSpade)){
selectedTool = Player::ToolSpade;
SetSelectedTool(Player::ToolSpade);
}
}else if(CheckKey(cg_keyToolBlock, name) && down){
if(world->GetLocalPlayer()->GetTeamId() < 2 &&
world->GetLocalPlayer()->IsAlive() &&
world->GetLocalPlayer()->IsToolSelectable(Player::ToolBlock)){
selectedTool = Player::ToolBlock;
SetSelectedTool(Player::ToolBlock);
}
}else if(CheckKey(cg_keyToolWeapon, name) && down){
if(world->GetLocalPlayer()->GetTeamId() < 2 &&
world->GetLocalPlayer()->IsAlive() &&
world->GetLocalPlayer()->IsToolSelectable(Player::ToolWeapon)){
selectedTool = Player::ToolWeapon;
SetSelectedTool(Player::ToolWeapon);
}
}else if(CheckKey(cg_keyToolGrenade, name) && down){
if(world->GetLocalPlayer()->GetTeamId() < 2 &&
world->GetLocalPlayer()->IsAlive() &&
world->GetLocalPlayer()->IsToolSelectable(Player::ToolGrenade)){
selectedTool = Player::ToolGrenade;
SetSelectedTool(Player::ToolGrenade);
}
}else if(CheckKey(cg_keyGlobalChat, name) && down){
// global chat
@ -1017,7 +1017,7 @@ namespace spades {
break;
}
}while(!world->GetLocalPlayer()->IsToolSelectable(t));
selectedTool = t;
SetSelectedTool(t);
}
}else if(name == (rev ? "WheelUp":"WheelDown")) {
if(world->GetLocalPlayer()->GetTeamId() < 2 &&
@ -1039,7 +1039,7 @@ namespace spades {
break;
}
}while(!world->GetLocalPlayer()->IsToolSelectable(t));
selectedTool = t;
SetSelectedTool(t);
}
}
}
@ -1138,6 +1138,18 @@ namespace spades {
}
}
void Client::SetSelectedTool(Player::ToolType type, bool quiet) {
if(type == selectedTool)
return;
selectedTool = type;
if(!quiet) {
IAudioChunk *c = audioDevice->RegisterSound("Sounds/Weapons/SwitchLocal.wav");
audioDevice->PlayLocal(c, MakeVector3(.4f, -.3f, .5f),
AudioParam());
}
}
#pragma mark - Drawing
void Client::TakeScreenShot(bool sceneOnly){
@ -4119,9 +4131,36 @@ namespace spades {
if(!IsMuted()){
bool isLocal = p == world->GetLocalPlayer();
IAudioChunk *c = isLocal ?
audioDevice->RegisterSound("Sounds/Weapons/SwitchLocal.wav"):
audioDevice->RegisterSound("Sounds/Weapons/Switch.wav");
IAudioChunk *c;
if(isLocal){
switch(p->GetTool()) {
case Player::ToolSpade:
c = audioDevice->RegisterSound("Sounds/Weapons/Spade/RaiseLocal.wav");
break;
case Player::ToolBlock:
c = audioDevice->RegisterSound("Sounds/Weapons/Block/RaiseLocal.wav");
break;
case Player::ToolWeapon:
switch(p->GetWeapon()->GetWeaponType()){
case RIFLE_WEAPON:
c = audioDevice->RegisterSound("Sounds/Weapons/Rifle/RaiseLocal.wav");
break;
case SMG_WEAPON:
c = audioDevice->RegisterSound("Sounds/Weapons/SMG/RaiseLocal.wav");
break;
case SHOTGUN_WEAPON:
c = audioDevice->RegisterSound("Sounds/Weapons/Shotgun/RaiseLocal.wav");
break;
}
break;
case Player::ToolGrenade:
c = audioDevice->RegisterSound("Sounds/Weapons/Grenade/RaiseLocal.wav");
break;
}
}else{
c = audioDevice->RegisterSound("Sounds/Weapons/Switch.wav");
}
if(isLocal)
audioDevice->PlayLocal(c, MakeVector3(.4f, -.3f, .5f),
AudioParam());

1
Sources/Client/Client.h
View File

@ -122,6 +122,7 @@ namespace spades {
Player::ToolType selectedTool;
float toolRaiseState;
void SetSelectedTool(Player::ToolType, bool quiet = false);
// view
SceneDefinition lastSceneDef;