Added weapon binds for buying

Added some more buying restrictions
Fixed a VGUI bug
This commit is contained in:
Marco Cawthorne 2017-01-10 21:24:14 +01:00
parent bbc798bccb
commit f1614d50ff
8 changed files with 43 additions and 5 deletions

View file

@ -71,21 +71,19 @@ void CSQC_ConsoleCommand_Init( void ) {
registercommand( "vsgren" );
registercommand( "defuser" );
registercommand( "nvg" );
registercommand( "coverme" );
registercommand( "takepoint" );
registercommand( "holdpos" );
registercommand( "regroup" );
registercommand( "followme" );
registercommand( "takingfire" );
registercommand( "go" );
registercommand( "fallback" );
registercommand( "sticktog" );
registercommand( "getinpos" );
registercommand( "stormfront" );
registercommand( "report" );
registercommand( "roger" );
registercommand( "enemyspot" );
registercommand( "needbackup" );
@ -138,96 +136,127 @@ float CSQC_ConsoleCommand( string sCMD ) {
return TRUE;
break;
case "glock":
sendevent( "PlayerBuyWeapon", "f", WEAPON_GLOCK18 );
return TRUE;
break;
case "usp":
sendevent( "PlayerBuyWeapon", "f", WEAPON_USP45 );
return TRUE;
break;
case "p228":
sendevent( "PlayerBuyWeapon", "f", WEAPON_P228 );
return TRUE;
break;
case "deagle":
sendevent( "PlayerBuyWeapon", "f", WEAPON_DEAGLE );
return TRUE;
break;
case "fn57":
sendevent( "PlayerBuyWeapon", "f", WEAPON_FIVESEVEN );
return TRUE;
break;
case "elites":
sendevent( "PlayerBuyWeapon", "f", WEAPON_ELITES );
return TRUE;
break;
case "m3":
sendevent( "PlayerBuyWeapon", "f", WEAPON_M3 );
return TRUE;
break;
case "xm1014":
sendevent( "PlayerBuyWeapon", "f", WEAPON_XM1014 );
return TRUE;
break;
case "tmp":
sendevent( "PlayerBuyWeapon", "f", WEAPON_TMP );
return TRUE;
break;
case "mac10":
sendevent( "PlayerBuyWeapon", "f", WEAPON_MAC10 );
return TRUE;
break;
case "mp5":
sendevent( "PlayerBuyWeapon", "f", WEAPON_MP5 );
return TRUE;
break;
case "ump45":
sendevent( "PlayerBuyWeapon", "f", WEAPON_UMP45 );
return TRUE;
break;
case "p90":
sendevent( "PlayerBuyWeapon", "f", WEAPON_P90 );
return TRUE;
break;
case "ak47":
sendevent( "PlayerBuyWeapon", "f", WEAPON_AK47 );
return TRUE;
break;
case "m4a1":
sendevent( "PlayerBuyWeapon", "f", WEAPON_M4A1 );
return TRUE;
break;
case "sg552":
sendevent( "PlayerBuyWeapon", "f", WEAPON_SG552 );
return TRUE;
break;
case "aug":
sendevent( "PlayerBuyWeapon", "f", WEAPON_AUG );
return TRUE;
break;
case "scout":
sendevent( "PlayerBuyWeapon", "f", WEAPON_SCOUT );
return TRUE;
break;
case "sg550":
sendevent( "PlayerBuyWeapon", "f", WEAPON_SG550 );
return TRUE;
break;
case "awp":
sendevent( "PlayerBuyWeapon", "f", WEAPON_AWP );
return TRUE;
break;
case "g3sg1":
sendevent( "PlayerBuyWeapon", "f", WEAPON_G3SG1 );
return TRUE;
break;
case "m249":
sendevent( "PlayerBuyWeapon", "f", WEAPON_PARA );
return TRUE;
break;
case "primammo":
sendevent( "GamePlayerBuyAmmo", "f", 0 );
return TRUE;
break;
case "secammo":
sendevent( "GamePlayerBuyAmmo", "f", 1 );
return TRUE;
break;
case "vest":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_KEVLAR );
return TRUE;
break;
case "vesthelm":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_HELMET );
return TRUE;
break;
case "flash":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_FLASHBANG );
return TRUE;
break;
case "hegren":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_HEGRENADE );
return TRUE;
break;
case "vsgren":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_SMOKEGRENADE );
return TRUE;
break;
case "defuser":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_DEFUSALKIT );
return TRUE;
break;
case "nvg":
sendevent( "PlayerBuyEquipment", "f", EQUIPMENT_NIGHTVISION );
return TRUE;
break;
case "coverme":

View file

@ -51,7 +51,7 @@ void CSQC_VGUI_Draw( void ) {
vVGUIColor = autocvar_vgui_color * ( 1 / 255 );
if ( fVGUI_Display >= 11 ) {
if ( fVGUI_Display >= VGUI_RADIO1 ) {
VGUI_Radio_Draw();
return;
}

View file

@ -61,7 +61,7 @@ void Entities_UseTargets( void ) {
entity eOld = self;
while ( eFind ) {
self = eFind;
bprint( sprintf( "Triggering %s %s\n", self.classname, self.targetname ) );
//bprint( sprintf( "Triggering %s %s\n", self.classname, self.targetname ) );
self.vUse();
eFind = eFind.chain;
}

View file

@ -69,6 +69,10 @@ float Rules_BuyingPossible( void ) {
}
}
if ( self.fInBuyZone == FALSE ) {
return FALSE;
}
return TRUE;
}

View file

@ -176,6 +176,7 @@ void CSEv_PlayerBuyWeapon_f( float fWeapon ) {
return;
}
// TODO: Don't allow CTs to buy T guns and vice versa!
if ( ( self.fMoney - wptTable[ fWeapon ].iPrice ) >= 0 ) {
Weapon_AddItem( fWeapon );

Binary file not shown.

View file

@ -14,6 +14,10 @@ bind r +button4
bind e +button6
bind n nightvision
bind TAB +showscores
bind c radio3
bind x radio2
bind z radio1
bind t messagemode
bind 1 "impulse 1"
bind 2 "impulse 2"

Binary file not shown.