From a2f65f73d7950cbcafa225fe880370894a75a0a3 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Mon, 10 May 2021 08:16:51 +0200 Subject: [PATCH] Shared: Inherit weapon_common and input from Nuclide's base game --- src/client/cmds.qc | 4 +- src/client/entities.qc | 4 +- src/client/hud_weaponselect.qc | 4 +- src/server/gamerules.qc | 2 +- src/server/gamerules_multiplayer.qc | 22 +++---- src/shared/include.src | 6 +- src/shared/input.qc | 95 ----------------------------- src/shared/item_c4bomb.qc | 2 +- src/shared/player.h | 6 +- src/shared/w_ak47.qc | 4 +- src/shared/w_aug.qc | 4 +- src/shared/w_awp.qc | 4 +- src/shared/w_c4bomb.qc | 4 +- src/shared/w_deagle.qc | 4 +- src/shared/w_elites.qc | 4 +- src/shared/w_fiveseven.qc | 4 +- src/shared/w_flashbang.qc | 4 +- src/shared/w_g3sg1.qc | 4 +- src/shared/w_glock18.qc | 4 +- src/shared/w_hegrenade.qc | 4 +- src/shared/w_m3.qc | 4 +- src/shared/w_m4a1.qc | 4 +- src/shared/w_mac10.qc | 4 +- src/shared/w_mp5.qc | 4 +- src/shared/w_p228.qc | 4 +- src/shared/w_p90.qc | 4 +- src/shared/w_para.qc | 4 +- src/shared/w_scout.qc | 4 +- src/shared/w_sg550.qc | 4 +- src/shared/w_sg552.qc | 4 +- src/shared/w_smokegrenade.qc | 4 +- src/shared/w_tmp.qc | 4 +- src/shared/w_ump45.qc | 4 +- src/shared/w_usp45.qc | 4 +- src/shared/w_xm1014.qc | 4 +- 35 files changed, 77 insertions(+), 172 deletions(-) delete mode 100644 src/shared/input.qc diff --git a/src/client/cmds.qc b/src/client/cmds.qc index 106d556..6471168 100644 --- a/src/client/cmds.qc +++ b/src/client/cmds.qc @@ -198,7 +198,7 @@ ClientGame_ConsoleCommand(void) sendevent("Radio", "f", RADIO_ENEMYDOWN); break; default: - return FALSE; + return (0); } - return TRUE; + return (1); } diff --git a/src/client/entities.qc b/src/client/entities.qc index 7531671..120d2ee 100644 --- a/src/client/entities.qc +++ b/src/client/entities.qc @@ -22,10 +22,10 @@ ClientGame_EntityUpdate(float id, float new) w_c4bomb_parse(); break; default: - return FALSE; + return (0); } - return TRUE; + return (1); } void diff --git a/src/client/hud_weaponselect.qc b/src/client/hud_weaponselect.qc index ae15230..ff7cd7c 100644 --- a/src/client/hud_weaponselect.qc +++ b/src/client/hud_weaponselect.qc @@ -113,11 +113,11 @@ HUD_InSlotPos(int slot, int pos) if (pl.g_items & g_weapons[i].id) { return i; } else { - return -1; + return (-1); } } } - return -1; + return (-1); } void diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc index 224c3fb..a6e05be 100644 --- a/src/server/gamerules.qc +++ b/src/server/gamerules.qc @@ -29,7 +29,7 @@ CSGameRules::PlayerPain(base_player pl) int CSGameRules::BuyingPossible(base_player pl) { - return FALSE; + return (0); } /* we check what fields have changed over the course of the frame and network diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index c68a342..0faff13 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -21,7 +21,7 @@ CSMultiplayerRules::MaxItemPerSlot(int slot) if (slot == 3) { return 3; } - return 1; + return (1); } void @@ -355,42 +355,42 @@ int CSMultiplayerRules::BuyingPossible(base_player pl) { if (pl.health <= 0) { - return FALSE; + return (0); } if (g_cs_gamestate == GAME_ACTIVE) { if (((autocvar_mp_roundtime * 60) - g_cs_gametime) > autocvar_mp_buytime) { centerprint(pl, sprintf("%d seconds have passed...\nYou can't buy anything now!", autocvar_mp_buytime)); - return FALSE; + return (0); } } if (pl.team == TEAM_VIP) { centerprint(pl, "You are the VIP...\nYou can't buy anything!\n"); - return FALSE; + return (0); } if (g_cstrike_buying == BUY_NEITHER) { centerprint(pl, "Sorry, you aren't meant\nto be buying anything.\n"); - return FALSE; + return (0); } if (g_cstrike_buying != BUY_BOTH) { if (g_cstrike_buying == BUY_CT && pl.team == TEAM_T) { centerprint(pl, "Terrorists aren't allowed to\nbuy anything on this map!\n"); - return FALSE; + return (0); } else if (g_cstrike_buying == BUY_T && pl.team == TEAM_CT) { centerprint(pl, "CTs aren't allowed to buy\nanything on this map!\n"); - return FALSE; + return (0); } } if (!(pl.gflags & GF_BUYZONE)) { centerprint(pl, "Sorry, you aren't in a buyzone.\n"); - return FALSE; + return (0); } - return TRUE; + return (1); } void @@ -913,10 +913,10 @@ CSMultiplayerRules::ConsoleCommand(base_player pp, string cmd) } break; default: - return FALSE; + return (0); } - return TRUE; + return (1); } void diff --git a/src/shared/include.src b/src/shared/include.src index a2bcbac..0aa37eb 100644 --- a/src/shared/include.src +++ b/src/shared/include.src @@ -1,7 +1,7 @@ #includelist flags.h player.h -../../../valve/src/shared/weapon_common.h +../../../base/src/shared/weapon_common.h animations.h animations.qc @@ -45,8 +45,8 @@ w_flashbang.qc w_hegrenade.qc w_smokegrenade.qc weapons.qc -../../../valve/src/shared/weapon_common.qc -input.qc +../../../base/src/shared/weapon_common.qc +../../../base/src/shared/input.qc pmove.qc ../../../valve/src/shared/pmove_water.qc item_c4bomb.qc diff --git a/src/shared/input.qc b/src/shared/input.qc deleted file mode 100644 index c967e6b..0000000 --- a/src/shared/input.qc +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2016-2020 Marco Hladik - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -void -Game_Input(void) -{ -#ifdef SERVER - CGameRules rules = (CGameRules)g_grMode; - - if (rules.m_iIntermission) { - rules.IntermissionEnd(); - return; - } - - if (input_buttons & INPUT_BUTTON5) { - Player_UseDown(); - } else { - Player_UseUp(); - } - - if (self.impulse == 100) { - Flashlight_Toggle(); - } - - if (cvar("sv_cheats") == 1) { - player pl = (player)self; - if (self.impulse == 101) { - pl.health = 100; - pl.armor = 100; - - Weapons_AddItem(pl, WEAPON_M3, -1); - Weapons_AddItem(pl, WEAPON_XM1014, -1); - Weapons_AddItem(pl, WEAPON_MP5, -1); - Weapons_AddItem(pl, WEAPON_P90, -1); - Weapons_AddItem(pl, WEAPON_UMP45, -1); - Weapons_AddItem(pl, WEAPON_MAC10, -1); - Weapons_AddItem(pl, WEAPON_TMP, -1); - Weapons_AddItem(pl, WEAPON_AK47, -1); - Weapons_AddItem(pl, WEAPON_SG552, -1); - Weapons_AddItem(pl, WEAPON_M4A1, -1); - Weapons_AddItem(pl, WEAPON_AUG, -1); - Weapons_AddItem(pl, WEAPON_SCOUT, -1); - Weapons_AddItem(pl, WEAPON_AWP, -1); - Weapons_AddItem(pl, WEAPON_G3SG1, -1); - Weapons_AddItem(pl, WEAPON_SG550, -1); - Weapons_AddItem(pl, WEAPON_PARA, -1); - Weapons_AddItem(pl, WEAPON_C4BOMB, -1); - Weapons_AddItem(pl, WEAPON_FLASHBANG, -1); - Weapons_AddItem(pl, WEAPON_HEGRENADE, -1); - Weapons_AddItem(pl, WEAPON_SMOKEGRENADE, -1); - Weapons_AddItem(pl, WEAPON_USP45, -1); - Weapons_AddItem(pl, WEAPON_GLOCK18, -1); - Weapons_AddItem(pl, WEAPON_DEAGLE, -1); - Weapons_AddItem(pl, WEAPON_P228, -1); - Weapons_AddItem(pl, WEAPON_ELITES, -1); - Weapons_AddItem(pl, WEAPON_FIVESEVEN, -1); - Weapons_AddItem(pl, WEAPON_KNIFE, -1); - } - - if (self.impulse == 102) { - // Respawn all the entities - for (entity a = world; (a = findfloat(a, ::identity, 1));) { - CBaseEntity caw = (CBaseEntity)a; - caw.Respawn(); - } - bprint(PRINT_HIGH, "Respawning all map entities...\n"); - } - } - - self.impulse = 0; -#endif - - if (input_buttons & INPUT_BUTTON0) { - Weapons_Primary(); - } else if (input_buttons & INPUT_BUTTON4) { - Weapons_Reload(); - } else if (input_buttons & INPUT_BUTTON3) { - Weapons_Secondary(); - } else { - Weapons_Release(); - } -} diff --git a/src/shared/item_c4bomb.qc b/src/shared/item_c4bomb.qc index fd70f21..205e741 100644 --- a/src/shared/item_c4bomb.qc +++ b/src/shared/item_c4bomb.qc @@ -54,7 +54,7 @@ item_c4::SendEntity(entity pvsent, float flags) WriteCoord(MSG_ENTITY, angles[1]); WriteCoord(MSG_ENTITY, angles[2]); WriteShort(MSG_ENTITY, modelindex); - return TRUE; + return (1); } void diff --git a/src/shared/player.h b/src/shared/player.h index e1e44ba..0dcc44f 100644 --- a/src/shared/player.h +++ b/src/shared/player.h @@ -508,11 +508,11 @@ float player::SendEntity(entity ePEnt, float fChanged) { if (health <= 0 && ePEnt != this) { - return FALSE; + return (0); } if (clienttype(ePEnt) != CLIENTTYPE_REAL) { - return FALSE; + return (0); } if (ePEnt != self) { @@ -595,6 +595,6 @@ player::SendEntity(entity ePEnt, float fChanged) WriteFloat(MSG_ENTITY, cs_shottime); } - return TRUE; + return (1); } #endif diff --git a/src/shared/w_ak47.qc b/src/shared/w_ak47.qc index 4690f4f..d086c0a 100644 --- a/src/shared/w_ak47.qc +++ b/src/shared/w_ak47.qc @@ -122,11 +122,11 @@ w_ak47_pickup(int new, int startammo) if (pl.ammo_762mm < AMMO_MAX_762MM) { pl.ammo_762mm = bound(0, pl.ammo_762mm + 30, AMMO_MAX_762MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_aug.qc b/src/shared/w_aug.qc index 300ec3c..3315cd1 100644 --- a/src/shared/w_aug.qc +++ b/src/shared/w_aug.qc @@ -88,11 +88,11 @@ w_aug_pickup(int new, int startammo) if (pl.ammo_762mm < AMMO_MAX_762MM) { pl.ammo_762mm = bound(0, pl.ammo_762mm + 30, AMMO_MAX_762MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_awp.qc b/src/shared/w_awp.qc index 5c643fc..e169a26 100644 --- a/src/shared/w_awp.qc +++ b/src/shared/w_awp.qc @@ -121,11 +121,11 @@ w_awp_pickup(int new, int startammo) if (pl.ammo_338mag < 20) { pl.ammo_338mag = bound(0, pl.ammo_338mag + 10, 20); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_c4bomb.qc b/src/shared/w_c4bomb.qc index b481e29..a1edcf6 100644 --- a/src/shared/w_c4bomb.qc +++ b/src/shared/w_c4bomb.qc @@ -187,9 +187,9 @@ w_c4bomb_pickup(int new, int startammo) player pl = (player)self; if (pl.team != TEAM_T) - return FALSE; + return (0); #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_deagle.qc b/src/shared/w_deagle.qc index 94cc194..a359359 100644 --- a/src/shared/w_deagle.qc +++ b/src/shared/w_deagle.qc @@ -120,11 +120,11 @@ w_deagle_pickup(int new, int startammo) if (pl.ammo_50ae < AMMO_MAX_50AE) { pl.ammo_50ae = bound(0, pl.ammo_50ae + 7, AMMO_MAX_50AE); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_elites.qc b/src/shared/w_elites.qc index 4063dc5..75b2145 100644 --- a/src/shared/w_elites.qc +++ b/src/shared/w_elites.qc @@ -142,11 +142,11 @@ w_elites_pickup(int new, int startammo) if (pl.ammo_9mm < AMMO_MAX_9MM) { pl.ammo_9mm = bound(0, pl.ammo_9mm + 30, AMMO_MAX_9MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_fiveseven.qc b/src/shared/w_fiveseven.qc index aa6f5ae..55702df 100644 --- a/src/shared/w_fiveseven.qc +++ b/src/shared/w_fiveseven.qc @@ -87,11 +87,11 @@ w_fiveseven_pickup(int new, int startammo) if (pl.ammo_57mm < AMMO_MAX_57MM) { pl.ammo_57mm = bound(0, pl.ammo_57mm + 20, AMMO_MAX_57MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_flashbang.qc b/src/shared/w_flashbang.qc index 7048345..6768788 100644 --- a/src/shared/w_flashbang.qc +++ b/src/shared/w_flashbang.qc @@ -64,10 +64,10 @@ w_flashbang_pickup(int new, int startammo) if (pl.ammo_fbgrenade < AMMO_MAX_FLASHBANG) { pl.ammo_fbgrenade = bound(0, pl.ammo_fbgrenade + 1, AMMO_MAX_FLASHBANG); } else { - return FALSE; + return (0); } #endif - return TRUE; + return (1); } string diff --git a/src/shared/w_g3sg1.qc b/src/shared/w_g3sg1.qc index c55c885..527577d 100644 --- a/src/shared/w_g3sg1.qc +++ b/src/shared/w_g3sg1.qc @@ -86,11 +86,11 @@ w_g3sg1_pickup(int new, int startammo) if (pl.ammo_762mm < AMMO_MAX_762MM) { pl.ammo_762mm = bound(0, pl.ammo_762mm + 20, AMMO_MAX_762MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_glock18.qc b/src/shared/w_glock18.qc index 3d7b2b9..74fcd44 100644 --- a/src/shared/w_glock18.qc +++ b/src/shared/w_glock18.qc @@ -97,11 +97,11 @@ w_glock18_pickup(int new, int startammo) if (pl.ammo_9mm < AMMO_MAX_9MM) { pl.ammo_9mm = bound(0, pl.ammo_9mm + 20, AMMO_MAX_9MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_hegrenade.qc b/src/shared/w_hegrenade.qc index 09dbe0f..7e8ccf5 100644 --- a/src/shared/w_hegrenade.qc +++ b/src/shared/w_hegrenade.qc @@ -64,10 +64,10 @@ w_hegrenade_pickup(int new, int startammo) if (pl.ammo_hegrenade < AMMO_MAX_HENADE) { pl.ammo_hegrenade = bound(0, pl.ammo_hegrenade + 1, AMMO_MAX_HENADE); } else { - return FALSE; + return (0); } #endif - return TRUE; + return (1); } string diff --git a/src/shared/w_m3.qc b/src/shared/w_m3.qc index 5718d40..824ca96 100644 --- a/src/shared/w_m3.qc +++ b/src/shared/w_m3.qc @@ -131,11 +131,11 @@ w_m3_pickup(int new, int startammo) if (pl.ammo_buckshot < AMMO_MAX_BUCKSHOT) { pl.ammo_buckshot = bound(0, pl.ammo_buckshot + 8, AMMO_MAX_BUCKSHOT); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_m4a1.qc b/src/shared/w_m4a1.qc index fd16fb2..89dd2ce 100644 --- a/src/shared/w_m4a1.qc +++ b/src/shared/w_m4a1.qc @@ -97,11 +97,11 @@ w_m4a1_pickup(int new, int startammo) if (pl.ammo_556mm < AMMO_MAX_556MM) { pl.ammo_556mm = bound(0, pl.ammo_556mm + 30, AMMO_MAX_556MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_mac10.qc b/src/shared/w_mac10.qc index f494918..44b49f6 100644 --- a/src/shared/w_mac10.qc +++ b/src/shared/w_mac10.qc @@ -87,11 +87,11 @@ w_mac10_pickup(int new, int startammo) if (pl.ammo_45acp < AMMO_MAX_45ACP) { pl.ammo_45acp = bound(0, pl.ammo_45acp + 30, AMMO_MAX_45ACP); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_mp5.qc b/src/shared/w_mp5.qc index 4aba7e8..9bf032e 100644 --- a/src/shared/w_mp5.qc +++ b/src/shared/w_mp5.qc @@ -87,11 +87,11 @@ w_mp5_pickup(int new, int startammo) if (pl.ammo_9mm < AMMO_MAX_9MM) { pl.ammo_9mm = bound(0, pl.ammo_9mm + 30, AMMO_MAX_9MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_p228.qc b/src/shared/w_p228.qc index e50176f..15b1f51 100644 --- a/src/shared/w_p228.qc +++ b/src/shared/w_p228.qc @@ -88,11 +88,11 @@ w_p228_pickup(int new, int startammo) if (pl.ammo_357sig < AMMO_MAX_357SIG) { pl.ammo_357sig = bound(0, pl.ammo_357sig + 13, AMMO_MAX_357SIG); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_p90.qc b/src/shared/w_p90.qc index cd059a4..f5ac35f 100644 --- a/src/shared/w_p90.qc +++ b/src/shared/w_p90.qc @@ -87,11 +87,11 @@ w_p90_pickup(int new, int startammo) if (pl.ammo_57mm < AMMO_MAX_57MM) { pl.ammo_57mm = bound(0, pl.ammo_57mm + 50, AMMO_MAX_57MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_para.qc b/src/shared/w_para.qc index 4ccb01d..b28f96b 100644 --- a/src/shared/w_para.qc +++ b/src/shared/w_para.qc @@ -86,11 +86,11 @@ w_para_pickup(int new, int startammo) if (pl.ammo_556mmbox < AMMO_MAX_556MMBOX) { pl.ammo_556mmbox = bound(0, pl.ammo_556mmbox + 100, AMMO_MAX_556MMBOX); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_scout.qc b/src/shared/w_scout.qc index 91be9af..f3406e8 100644 --- a/src/shared/w_scout.qc +++ b/src/shared/w_scout.qc @@ -86,11 +86,11 @@ w_scout_pickup(int new, int startammo) if (pl.ammo_762mm < AMMO_MAX_762MM) { pl.ammo_762mm = bound(0, pl.ammo_762mm + 10, AMMO_MAX_762MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_sg550.qc b/src/shared/w_sg550.qc index e9b41cf..b1a554b 100644 --- a/src/shared/w_sg550.qc +++ b/src/shared/w_sg550.qc @@ -86,11 +86,11 @@ w_sg550_pickup(int new, int startammo) if (pl.ammo_556mm < AMMO_MAX_556MM) { pl.ammo_556mm = bound(0, pl.ammo_556mm + 30, AMMO_MAX_556MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_sg552.qc b/src/shared/w_sg552.qc index 489e9f1..c46be63 100644 --- a/src/shared/w_sg552.qc +++ b/src/shared/w_sg552.qc @@ -87,11 +87,11 @@ w_sg552_pickup(int new, int startammo) if (pl.ammo_556mm < AMMO_MAX_556MM) { pl.ammo_556mm = bound(0, pl.ammo_556mm + 30, AMMO_MAX_556MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_smokegrenade.qc b/src/shared/w_smokegrenade.qc index 6ac3ae0..a702d88 100644 --- a/src/shared/w_smokegrenade.qc +++ b/src/shared/w_smokegrenade.qc @@ -64,10 +64,10 @@ w_smokegrenade_pickup(int new, int startammo) if (pl.ammo_smokegrenade < AMMO_MAX_SMOKE) { pl.ammo_smokegrenade = bound(0, pl.ammo_smokegrenade + 1, AMMO_MAX_SMOKE); } else { - return FALSE; + return (0); } #endif - return TRUE; + return (1); } string diff --git a/src/shared/w_tmp.qc b/src/shared/w_tmp.qc index f10c7ab..7106175 100644 --- a/src/shared/w_tmp.qc +++ b/src/shared/w_tmp.qc @@ -87,11 +87,11 @@ w_tmp_pickup(int new, int startammo) if (pl.ammo_9mm < AMMO_MAX_9MM) { pl.ammo_9mm = bound(0, pl.ammo_9mm + 30, AMMO_MAX_9MM); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_ump45.qc b/src/shared/w_ump45.qc index 1dc7482..bf3ae47 100644 --- a/src/shared/w_ump45.qc +++ b/src/shared/w_ump45.qc @@ -87,11 +87,11 @@ w_ump45_pickup(int new, int startammo) if (pl.ammo_45acp < AMMO_MAX_45ACP) { pl.ammo_45acp = bound(0, pl.ammo_45acp + 25, AMMO_MAX_45ACP); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_usp45.qc b/src/shared/w_usp45.qc index 7d8f7c2..cdb24d8 100644 --- a/src/shared/w_usp45.qc +++ b/src/shared/w_usp45.qc @@ -100,11 +100,11 @@ w_usp45_pickup(int new, int startammo) if (pl.ammo_45acp < AMMO_MAX_45ACP) { pl.ammo_45acp = bound(0, pl.ammo_45acp + 12, AMMO_MAX_45ACP); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void diff --git a/src/shared/w_xm1014.qc b/src/shared/w_xm1014.qc index 4df7060..1b3be1a 100644 --- a/src/shared/w_xm1014.qc +++ b/src/shared/w_xm1014.qc @@ -130,11 +130,11 @@ w_xm1014_pickup(int new, int startammo) if (pl.ammo_buckshot < AMMO_MAX_BUCKSHOT) { pl.ammo_buckshot = bound(0, pl.ammo_buckshot + 7, AMMO_MAX_BUCKSHOT); } else { - return FALSE; + return (0); } } #endif - return TRUE; + return (1); } void