fallout2ce/fallout2-ce
0
0
Fork 0
mirror of https://github.com/fallout2-ce/fallout2-ce.git synced 2026-07-27 16:47:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add guards for null references in skill.cc (#557)

Browse Source 
* add guards for null reference in skill.cc

* removed skillGetBaseValue and add debugPrint
This commit is contained in:
jirik2077
2026-07-17 09:17:37 +02:00
committed by GitHub
parent 41f09fa343
commit aa439efd04
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/skill.cc
+27 -25
View File
@@ -236,7 +236,14 @@ int skillGetValue(Object* critter, int skill)
return -5;
}
int baseValue = skillGetBaseValue(critter, skill);
Proto* proto;
if (protoGetProto(critter->pid, &proto) == -1) {
debugPrint("\nError: Failed to get a proto in skillGetValue for critter %d with a pid %d!", critter->id, critter->pid);
return -5;
}
int baseValue = proto->critter.data.skills[skill];
if (baseValue < 0) {
return baseValue;
}
@@ -277,19 +284,6 @@ int skillGetDefaultValue(int skill)
return skillIsValid(skill) ? gSkillDescriptions[skill].defaultValue : -5;
}
// 0x4AA680
int skillGetBaseValue(Object* obj, int skill)
{
if (!skillIsValid(skill)) {
return 0;
}
Proto* proto;
protoGetProto(obj->pid, &proto);
return proto->critter.data.skills[skill];
}
// 0x4AA6BC
int skillAdd(Object* obj, int skill)
{
@@ -301,9 +295,6 @@ int skillAdd(Object* obj, int skill)
return -5;
}
Proto* proto;
protoGetProto(obj->pid, &proto);
int unspentSp = pcGetStat(PC_STAT_UNSPENT_SKILL_POINTS);
if (unspentSp <= 0) {
return -4;
@@ -314,6 +305,11 @@ int skillAdd(Object* obj, int skill)
return -3;
}
Proto* proto;
if (protoGetProto(obj->pid, &proto) == -1) {
return -5;
}
// NOTE: Uninline.
int requiredSp = skillsGetCost(skillValue);
@@ -340,13 +336,15 @@ int skillAddForce(Object* obj, int skill)
return -5;
}
Proto* proto;
protoGetProto(obj->pid, &proto);
if (skillGetValue(obj, skill) >= 300) {
return -3;
}
Proto* proto;
if (protoGetProto(obj->pid, &proto) == -1) {
return -5;
}
proto->critter.data.skills[skill] += 1;
return 0;
@@ -386,16 +384,18 @@ int skillSub(Object* critter, int skill)
return -5;
}
int unspentSp = pcGetStat(PC_STAT_UNSPENT_SKILL_POINTS);
int skillValue = skillGetValue(critter, skill) - 1;
Proto* proto;
protoGetProto(critter->pid, &proto);
if (protoGetProto(critter->pid, &proto) == -1) {
return -5;
}
if (proto->critter.data.skills[skill] <= 0) {
return -2;
}
int unspentSp = pcGetStat(PC_STAT_UNSPENT_SKILL_POINTS);
int skillValue = skillGetValue(critter, skill) - 1;
// NOTE: Uninline.
int requiredSp = skillsGetCost(skillValue);
@@ -440,7 +440,9 @@ int skillSubForce(Object* obj, int skill)
return -5;
}
protoGetProto(obj->pid, &proto);
if (protoGetProto(obj->pid, &proto) == -1) {
return -5;
}
if (proto->critter.data.skills[skill] <= 0) {
return -2;
src/skill.h
-1
View File
@@ -29,7 +29,6 @@ void skillsGetTagged(int* skills, int count);
bool skillIsTagged(int skill);
int skillGetValue(Object* critter, int skill);
int skillGetDefaultValue(int skill);
int skillGetBaseValue(Object* critter, int skill);
int skillAdd(Object* critter, int skill);
int skillAddForce(Object* critter, int skill);
int skillsGetCost(int skillValue);