Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21765
Modified Files:
playercontroller.cc weapon.cc
Log Message:
Bruit de tir pour l'arme
Index: playercontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/playercontroller.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** playercontroller.cc 13 Nov 2004 23:38:08 -0000 1.15
--- playercontroller.cc 14 Nov 2004 13:07:17 -0000 1.16
***************
*** 28,31 ****
--- 28,32 ----
Vector3 vPosition = pPawn->GetPosition()+vViewOffset;
pWeapon->Fire (vPosition, vTarget, pPawn);
+
/* vTarget = vPosition - vTarget*1000000;
***************
*** 118,125 ****
SoundManager::pSoundManager->PlaySound("step");
break;
- case TGKEY_SPACE:
- SoundManager::pSoundManager->PlaySound("gun");
- break;
-
case TGKEY_RIGHT:
pPawn->SetPosition(Game::pSelf->GetWorld()->GetRandomStartPosition()+Vector3(20,80,20));
--- 119,122 ----
Index: weapon.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/weapon.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** weapon.cc 13 Nov 2004 23:38:08 -0000 1.1
--- weapon.cc 14 Nov 2004 13:07:17 -0000 1.2
***************
*** 1,4 ****
--- 1,5 ----
#include "weapon.h"
#include "game.h"
+ #include <soundmanager.h>
Weapon::Weapon ()
***************
*** 44,48 ****
cR.pNode->GetPhysicCallBack()->Collide(NULL, cR.EndPoint, cR.Normal);
!
}
--- 45,49 ----
cR.pNode->GetPhysicCallBack()->Collide(NULL, cR.EndPoint, cR.Normal);
! SoundManager::pSoundManager->PlaySound("gun");
}
|
