Skip to content

Commit 67fec21

Browse files
committed
Merge branch 'master' of https://github.com/sfall-team/sfall into better-docs
2 parents cfa6528 + ca3df33 commit 67fec21

12 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727

2828
- name: Clone sfall
29-
uses: actions/checkout@v6
29+
uses: actions/checkout@v7
3030

3131
# Action is used twice for self-testing only
3232
# DevXP build results are intentionally *not* included in artifact

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v6
13+
uses: actions/checkout@v7
1414

1515
- name: Setup Python
1616
uses: actions/setup-python@v6

artifacts/mods/gl_highlighting.int

38 Bytes
Binary file not shown.

artifacts/mods/gl_highlighting.ssl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ end
5151

5252
procedure DudeCanSee(variable obj) begin
5353
variable block := obj_blocking_line(dude_obj, tile_num(obj), BLOCKING_TYPE_SHOOT);
54-
return not block or block == obj;
54+
return not block or block == obj or tile_num(block) == tile_num(obj);
5555
end
5656

5757
procedure DudeCanHear(variable obj) begin

artifacts/scripting/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
opcode: 0x8185
294294
- name: set_perk_int
295295
detail: void set_perk_int(int perkID, int value)
296-
opcode: 0x8196
296+
opcode: 0x8186
297297
- name: set_perk_agl
298298
detail: void set_perk_agl(int perkID, int value)
299299
opcode: 0x8187

artifacts/scripting/sfall opcode list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
| 0x8183 | `void set_perk_per(int perkID, int value)` |
102102
| 0x8184 | `void set_perk_end(int perkID, int value)` |
103103
| 0x8185 | `void set_perk_chr(int perkID, int value)` |
104-
| 0x8196 | `void set_perk_int(int perkID, int value)` |
104+
| 0x8186 | `void set_perk_int(int perkID, int value)` |
105105
| 0x8187 | `void set_perk_agl(int perkID, int value)` |
106106
| 0x8188 | `void set_perk_lck(int perkID, int value)` |
107107
| 0x8189 | `void set_perk_name(int perkID, string value)` |

artifacts/scripting/sfall opcode list.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
0x8183 - void set_perk_per(int perkID, int value)
100100
0x8184 - void set_perk_end(int perkID, int value)
101101
0x8185 - void set_perk_chr(int perkID, int value)
102-
0x8196 - void set_perk_int(int perkID, int value)
102+
0x8186 - void set_perk_int(int perkID, int value)
103103
0x8187 - void set_perk_agl(int perkID, int value)
104104
0x8188 - void set_perk_lck(int perkID, int value)
105105
0x8189 - void set_perk_name(int perkID, string value)

artifacts/sfall_dat/sfall.dat

5 Bytes
Binary file not shown.

artifacts/sfall_dat/sfall_de.dat

5 Bytes
Binary file not shown.

artifacts/sfall_dat/sfall_fr.dat

5 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)