eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve aiHaveAmmo

This commit is contained in:
Alexander Batalov 2022-08-31 12:05:56 +03:00
parent 7750006127
commit 1e5047cd48
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/combat_ai.cc
View File

@ -105,7 +105,7 @@ static Object* _ai_find_nearest_team(Object* a1, Object* a2, int a3);
static Object* _ai_find_nearest_team_in_combat(Object* a1, Object* a2, int a3); static Object* _ai_find_nearest_team_in_combat(Object* a1, Object* a2, int a3);
static int _ai_find_attackers(Object* a1, Object** a2, Object** a3, Object** a4); static int _ai_find_attackers(Object* a1, Object** a2, Object** a3, Object** a4);
static Object* _ai_danger_source(Object* a1); static Object* _ai_danger_source(Object* a1);
static int _ai_have_ammo(Object* critter_obj, Object* weapon_obj, Object** out_ammo_obj); static bool aiHaveAmmo(Object* critter, Object* weapon, Object** ammoPtr);
static bool _caiHasWeapPrefType(AiPacket* ai, int attackType); static bool _caiHasWeapPrefType(AiPacket* ai, int attackType);
static Object* _ai_best_weapon(Object* a1, Object* a2, Object* a3, Object* a4); static Object* _ai_best_weapon(Object* a1, Object* a2, Object* a3, Object* a4);
static bool _ai_can_use_weapon(Object* critter, Object* weapon, int hitMode); static bool _ai_can_use_weapon(Object* critter, Object* weapon, int hitMode);
@ -1619,44 +1619,41 @@ void _caiTeamCombatExit()
} }
// 0x4292D4 // 0x4292D4
static int _ai_have_ammo(Object* critter_obj, Object* weapon_obj, Object** out_ammo_obj) static bool aiHaveAmmo(Object* critter, Object* weapon, Object** ammoPtr)
{ {
int v9; if (ammoPtr != NULL) {
Object* ammo_obj; *ammoPtr = NULL;
if (out_ammo_obj) {
*out_ammo_obj = NULL;
} }
if (weapon_obj->pid == PROTO_ID_SOLAR_SCORCHER) { if (weapon->pid == PROTO_ID_SOLAR_SCORCHER) {
return lightGetLightLevel() > 62259; return lightGetLightLevel() > 62259;
} }
v9 = -1; int inventoryItemIndex = -1;
while (1) { while (1) {
ammo_obj = _inven_find_type(critter_obj, 4, &v9); Object* ammo = _inven_find_type(critter, ITEM_TYPE_AMMO, &inventoryItemIndex);
if (ammo_obj == NULL) { if (ammo == NULL) {
break; break;
} }
if (weaponCanBeReloadedWith(weapon_obj, ammo_obj)) { if (weaponCanBeReloadedWith(weapon, ammo)) {
if (out_ammo_obj) { if (ammoPtr != NULL) {
*out_ammo_obj = ammo_obj; *ammoPtr = ammo;
} }
return 1; return true;
} }
if (weaponGetAnimationCode(weapon_obj)) { if (weaponGetAnimationCode(weapon)) {
if (weaponGetRange(critter_obj, 2) < 3) { if (weaponGetRange(critter, HIT_MODE_RIGHT_WEAPON_PRIMARY) < 3) {
_inven_unwield(critter_obj, 1); _inven_unwield(critter, HAND_RIGHT);
} }
} else { } else {
_inven_unwield(critter_obj, 1); _inven_unwield(critter, HAND_RIGHT);
} }
} }
return 0; return false;
} }
// 0x42938C // 0x42938C
@ -1893,7 +1890,7 @@ Object* _ai_search_inven_weap(Object* critter, int a2, Object* a3)
if (weaponGetAttackTypeForHitMode(weapon, HIT_MODE_RIGHT_WEAPON_PRIMARY) == ATTACK_TYPE_RANGED) { if (weaponGetAttackTypeForHitMode(weapon, HIT_MODE_RIGHT_WEAPON_PRIMARY) == ATTACK_TYPE_RANGED) {
if (ammoGetQuantity(weapon) == 0) { if (ammoGetQuantity(weapon) == 0) {
if (!_ai_have_ammo(critter, weapon, NULL)) { if (!aiHaveAmmo(critter, weapon, NULL)) {
continue; continue;
} }
} }
@ -2545,7 +2542,7 @@ static int _ai_try_attack(Object* a1, Object* a2)
int reason = _combat_check_bad_shot(a1, a2, hitMode, false); int reason = _combat_check_bad_shot(a1, a2, hitMode, false);
if (reason == 1) { if (reason == 1) {
// out of ammo // out of ammo
if (_ai_have_ammo(a1, weapon, &ammo)) { if (aiHaveAmmo(a1, weapon, &ammo)) {
int v9 = weaponReload(weapon, ammo); int v9 = weaponReload(weapon, ammo);
if (v9 == 0 && ammo != NULL) { if (v9 == 0 && ammo != NULL) {
_obj_destroy(ammo); _obj_destroy(ammo);
@ -2727,7 +2724,7 @@ void aiAttemptWeaponReload(Object* critter, int animate)
int ammoCapacity = ammoGetCapacity(weapon); int ammoCapacity = ammoGetCapacity(weapon);
if (ammoQuantity < ammoCapacity) { if (ammoQuantity < ammoCapacity) {
Object* ammo; Object* ammo;
if (_ai_have_ammo(critter, weapon, &ammo)) { if (aiHaveAmmo(critter, weapon, &ammo)) {
int rc = weaponReload(weapon, ammo); int rc = weaponReload(weapon, ammo);
if (rc == 0) { if (rc == 0) {
_obj_destroy(ammo); _obj_destroy(ammo);