fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken GetProto() function (again)

Browse Source
This commit is contained in:
NovaRain
2021-02-10 23:52:56 +08:00
parent 6d7ef3c76b
commit 7ce7f4db27
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine.cpp
+4 -4
View File
@@ -534,16 +534,16 @@ Queue* QueueFind(TGameObj* object, long type) {
long AnimCodeByWeapon(TGameObj* weapon) { long AnimCodeByWeapon(TGameObj* weapon) {
if (weapon != nullptr) { if (weapon != nullptr) {
sProto* proto = nullptr; sProto* proto;
if (GetProto(weapon->protoId, proto) && proto->item.type == item_type_weapon) { if (GetProto(weapon->protoId, &proto) && proto->item.type == item_type_weapon) {
return proto->item.weapon.animationCode; return proto->item.weapon.animationCode;
} }
} }
return 0; return 0;
} }
bool GetProto(long pid, sProto* outProto) { bool GetProto(long pid, sProto** outProto) {
return (fo_proto_ptr(pid, &outProto) != -1); return (fo_proto_ptr(pid, outProto) != -1);
} }
void SkillGetTags(long* result, long num) { void SkillGetTags(long* result, long num) {
sfall/FalloutEngine.h
+1 -1
View File
@@ -508,7 +508,7 @@ Queue* QueueFind(TGameObj* object, long type);
long AnimCodeByWeapon(TGameObj* weapon); long AnimCodeByWeapon(TGameObj* weapon);
// returns False if the prototype does not exist, or pointer to prototype by PID in the outProto argument // returns False if the prototype does not exist, or pointer to prototype by PID in the outProto argument
bool GetProto(long pid, sProto* outProto); bool GetProto(long pid, sProto** outProto);
// returns pointer to prototype by PID, or nullptr on get failure // returns pointer to prototype by PID, or nullptr on get failure
// NOTE: not an efficient construction // NOTE: not an efficient construction
sfall/Inventory.cpp
+3 -3
View File
@@ -101,12 +101,12 @@ DWORD __stdcall sfgame_adjust_fid() {
// vanilla logic: // vanilla logic:
indexNum = *ptr_art_vault_guy_num; indexNum = *ptr_art_vault_guy_num;
sProto* critterPro; sProto* critterPro;
if (GetProto(*ptr_inven_pid, critterPro)) { if (GetProto(*ptr_inven_pid, &critterPro)) {
indexNum = critterPro->fid & 0xFFF; indexNum = critterPro->fid & 0xFFF;
} }
if (*ptr_i_worn != nullptr) { if (*ptr_i_worn != nullptr) {
sProto* armorPro; sProto* armorPro;
GetProto((*ptr_i_worn)->protoId, armorPro); GetProto((*ptr_i_worn)->protoId, &armorPro);
DWORD armorFid = fo_stat_level(*ptr_inven_dude, STAT_gender) == GENDER_FEMALE DWORD armorFid = fo_stat_level(*ptr_inven_dude, STAT_gender) == GENDER_FEMALE
? armorPro->item.armor.femaleFID ? armorPro->item.armor.femaleFID
: armorPro->item.armor.maleFID; : armorPro->item.armor.maleFID;
@@ -122,7 +122,7 @@ DWORD __stdcall sfgame_adjust_fid() {
if (itemInHand != nullptr) { if (itemInHand != nullptr) {
sProto* itemPro; sProto* itemPro;
if (GetProto(itemInHand->protoId, itemPro) && itemPro->item.type == item_type_weapon) { if (GetProto(itemInHand->protoId, &itemPro) && itemPro->item.type == item_type_weapon) {
weaponAnimCode = itemPro->item.weapon.animationCode; weaponAnimCode = itemPro->item.weapon.animationCode;
} }
} }