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

Re-fixed the return value of get_script function

Browse Source
This commit is contained in:
NovaRain
2019-12-09 10:18:29 +08:00
parent 702e62e610
commit 439de4aecc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/sfall function notes.txt
+3 -2
View File
@@ -153,12 +153,13 @@ array - array ID to be used with array-related functions (actually an integer)
- accepts a pointer to an object and will remove the script from that object. - accepts a pointer to an object and will remove the script from that object.
> void set_script(object, int scriptid) > void set_script(object, int scriptid)
- accepts a pointer to an object and scriptID, and applies the given script to an object (scriptID accept the same values as create_object_sid from sfall 3.6) - accepts a pointer to an object and scriptID, and applies the given script to an object (scriptID accepts the same values as create_object_sid)
- If used on an object that is already scripted, it will remove the existing script first; you cannot have multiple scripts attached to a single object. Calling set_script on self_obj will have all sorts of wacky side effects, and should be avoided. - If used on an object that is already scripted, it will remove the existing script first; you cannot have multiple scripts attached to a single object. Calling set_script on self_obj will have all sorts of wacky side effects, and should be avoided.
- if you add 0x80000000 to the sid when calling set_script, map_enter_p_proc will be SKIPPED. The start proc will always be run. - if you add 0x80000000 to the sid when calling set_script, map_enter_p_proc will be SKIPPED. The start proc will always be run.
> int get_script(object) > int get_script(object)
- accepts a pointer to an object and returns its scriptID (line number in scripts.lst), or -1 if the object is unscripted. - accepts a pointer to an object and returns its scriptID (line number in scripts.lst), or 0 if the object is unscripted.
- returns -1 on argument error.
> void set_self(int obj) > void set_self(int obj)
- overrides the scripts self_obj for the next function call. - overrides the scripts self_obj for the next function call.
sfall/Modules/Scripting/Handlers/Objects.cpp
+8 -9
View File
@@ -36,9 +36,9 @@ namespace sfall
namespace script namespace script
{ {
#define exec_script_proc(script, stype) __asm { \ #define exec_script_proc(script, proc) __asm { \
__asm mov eax, script \ __asm mov eax, script \
__asm mov edx, stype \ __asm mov edx, proc \
__asm call fo::funcoffs::exec_script_proc_ \ __asm call fo::funcoffs::exec_script_proc_ \
} }
@@ -56,14 +56,13 @@ void sf_set_script(OpcodeContext& ctx) {
long scriptType; long scriptType;
auto object = ctx.arg(0).object(); auto object = ctx.arg(0).object();
DWORD scriptIndex = ctx.arg(1).rawValue(); unsigned long valArg = ctx.arg(1).rawValue();
if ((scriptIndex & ~0x80000000) == 0) { long scriptIndex = valArg & ~0xF0000000;
if (scriptIndex == 0 || valArg > 0x8FFFFFFF) { // negative values are not allowed
ctx.printOpcodeError("%s() - the script index number is incorrect.", ctx.getOpcodeName()); ctx.printOpcodeError("%s() - the script index number is incorrect.", ctx.getOpcodeName());
return; return;
} }
bool runMapEnter = (scriptIndex & 0x80000000) == 0;
if (!runMapEnter) scriptIndex ^= 0x80000000;
scriptIndex--; scriptIndex--;
if (object->scriptId != 0xFFFFFFFF) { if (object->scriptId != 0xFFFFFFFF) {
@@ -79,7 +78,7 @@ void sf_set_script(OpcodeContext& ctx) {
long scriptId = object->scriptId; long scriptId = object->scriptId;
exec_script_proc(scriptId, start); exec_script_proc(scriptId, start);
if (runMapEnter) exec_script_proc(scriptId, map_enter_p_proc); if ((valArg & 0x80000000) == 0) exec_script_proc(scriptId, map_enter_p_proc);
} }
void sf_create_spatial(OpcodeContext& ctx) { void sf_create_spatial(OpcodeContext& ctx) {
@@ -114,8 +113,8 @@ void sf_spatial_radius(OpcodeContext& ctx) {
} }
void sf_get_script(OpcodeContext& ctx) { void sf_get_script(OpcodeContext& ctx) {
auto obj = ctx.arg(0).object(); auto scriptIndex = ctx.arg(0).object()->scriptIndex;
ctx.setReturn(++obj->scriptIndex); ctx.setReturn((scriptIndex >= 0) ? ++scriptIndex : 0);
} }
void sf_set_critter_burst_disable(OpcodeContext& ctx) { void sf_set_critter_burst_disable(OpcodeContext& ctx) {