Skip to content

Commit afea68d

Browse files
committed
fix: small fixes to update_items.simba
1 parent 05f2591 commit afea68d

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

tools/update_items.simba

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ begin
2626
DirDelete(PATH + 'masks', False);
2727
end;
2828

29-
FileDelete(PATH + 'data' + PATH_SEP + 'hash.txt');
30-
FileDelete(PATH + 'masks.zip');
29+
if FileExists(PATH + 'data' + PATH_SEP + 'hash.txt') then
30+
if not FileDelete(PATH + 'data' + PATH_SEP + 'hash.txt') then
31+
raise 'Couldn''t delete ' + PATH + 'data' + PATH_SEP + 'hash.txt';
3132

3233
files := DirList(PATH + 'items-imgs', True);
3334
if files = [] then
@@ -54,9 +55,10 @@ var
5455
tpa: TPointArray;
5556
begin
5657
if SINGLE_ITEM <> '' then
57-
if not filename.Contains(SINGLE_ITEM + '.png') then Exit;
58+
if not filename.EndsWith(SINGLE_ITEM + '.png') then Exit;
5859

5960
img := new TImage(filename);
61+
6062
img.FillWithAlpha($FF); //ensure there's no weird alphas.
6163
img.ReplaceColor($202030, $0); //remove the item shadow
6264

@@ -99,14 +101,21 @@ begin
99101
for itemData in ITEM_DATA_ARRAY do
100102
FileAppend(PATH + 'data' + PATH_SEP + 'hash.txt', itemData.ItemHash + LINE_SEP);
101103

102-
FileDelete(PATH + 'items.bin');
104+
if FileExists(PATH + 'items.bin') then
105+
if not FileDelete(PATH + 'items.bin') then
106+
raise 'Couldn''t delete ' + PATH + 'items.bin';
107+
103108
writer := new TResourceWriter();
104109
writer.AddImages(PATH + 'items-imgs', '*.png', False);
105110
writer.AddImages(PATH + 'masks', '*.bmp', False);
106111
writer.Save(PATH + 'items.bin');
107112

108-
FileDelete(PATH + 'items.zip');
109-
ZipFiles(PATH + 'items.zip', [PATH + 'items.bin']);
113+
if FileExists(PATH + 'items.zip') then
114+
if not FileDelete(PATH + 'items.zip') then
115+
raise 'Couldn''t delete ' + PATH + 'items.zip';
116+
117+
if not ZipFiles(PATH + 'items.zip', [PATH + 'items.bin']) then
118+
raise 'Couldn''t zip ' + PATH + 'items.bin';
110119

111120
if RESET then
112121
begin

0 commit comments

Comments
 (0)