3 files changed, 7 insertions, 5 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index b33c742e..eb92bd28 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -428,7 +428,7 @@ void CG_Menu( centity_t *cent, int eventParm )
       break;
 
     case MN_DROID:
-      trap_SendConsoleCommand( "menu aclassmenu\n" );
+      trap_SendConsoleCommand( "menu dclassmenu\n" );
       break;
 
     case MN_HUMAN:
@@ -436,7 +436,7 @@ void CG_Menu( centity_t *cent, int eventParm )
       break;
 
     case MN_ABUILD:
-      trap_SendConsoleCommand( "menu abuildmenu\n" );
+      trap_SendConsoleCommand( "menu dbuildmenu\n" );
       break;
 
     case MN_HBUILD:
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 7583d402..0672442f 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -659,10 +659,12 @@ static void CG_RegisterSounds( void ) {
   cgs.media.n_healthSound = trap_S_RegisterSound("sound/items/n_health.wav", qfalse );
   cgs.media.hgrenb1aSound = trap_S_RegisterSound("sound/weapons/grenade/hgrenb1a.wav", qfalse);
   cgs.media.hgrenb2aSound = trap_S_RegisterSound("sound/weapons/grenade/hgrenb2a.wav", qfalse);
-  cgs.media.wstbimplSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbimpl.wav", qfalse);
+
+  //TA: it complains about these
+  /*cgs.media.wstbimplSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbimpl.wav", qfalse);
   cgs.media.wstbimpmSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbimpm.wav", qfalse);
   cgs.media.wstbimpdSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbimpd.wav", qfalse);
-  cgs.media.wstbactvSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbactv.wav", qfalse);
+  cgs.media.wstbactvSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbactv.wav", qfalse);*/
 }
 
 
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index bde65c39..6eab6c7c 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -561,7 +561,7 @@ void CG_RegisterWeapon( int weaponNum ) {
   case WP_FLAMER:
     weaponInfo->missileSound = trap_S_RegisterSound( "sound/weapons/plasma/lasfly.wav", qfalse );
     MAKERGB( weaponInfo->flashDlightColor, 0.25, 0.1, 0 );
-    weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/plasma/rg_hum.wav", qfalse );
+    weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/railgun/railgf1a.wav", qfalse );
     cgs.media.flameExplShader = trap_R_RegisterShader( "rocketExplosion" );
     break;