Skip to content

Improve error handling in GetArray functions #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
XxXAdvisaryXxX wants to merge 1 commit into from
Closed

Improve error handling in GetArray functions #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions osrs/data/data.simba
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,17 +488,31 @@ end;


function TWeaponData.GetArray(index: Integer): TJSONItem;
var
blankJSON : TJSONItem;
begin
Self.Setup();
Result := Self.Data.Item[index];
try
Self.Setup();
Result := Self.Data.Item[index];
finally
WriteLn GetDebugLn('Object Not Found In DataBase' , False);
Result := blankJSON;
end;
end;

function TWeaponData.GetArray(key: String): TJSONItem; overload;
var
blankJSON : TJSONItem;
begin
Self.Setup();
if key = 'secondary_ammo' then key := 'ammo';
Result := Self.Data.Item[key];
end;
try
Self.Setup();
if key = 'secondary_ammo' then key := 'ammo';
Result := Self.Data.Item[key];
finally
WriteLn GetDebugLn('Object Not Found In DataBase' , False);
Result := blankJSON;
end;
end;


function TWeaponData.GetItems(key: Integer): TRSItemArray;
Expand Down