From 513338f1605af82b4846dd6c4beaa50cb6801989 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Mon, 21 Aug 2017 11:33:04 +0800 Subject: [PATCH] Fixed incorrect argument description for get/set_proto_data in sfall opcode list.txt. Removed incorrect PROTO_CR_FLAGS value in define_extra.h (was actually critter's IN), and renamed PROTO_CR_ACTION_FLAGS to its correct name #112 (cherry picked from commit ad17773ace027ca572591e8b5d645bf2fb7b260f) --- artifacts/scripting/headers/define_extra.h | 3 +-- artifacts/scripting/sfall opcode list.txt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/artifacts/scripting/headers/define_extra.h b/artifacts/scripting/headers/define_extra.h index c8d398a2..84863296 100644 --- a/artifacts/scripting/headers/define_extra.h +++ b/artifacts/scripting/headers/define_extra.h @@ -160,11 +160,10 @@ #define PROTO_DR_ADDICT_DELAY (100) // critters -#define PROTO_CR_ACTION_FLAGS (32) +#define PROTO_CR_FLAGS (32) #define PROTO_CR_HEAD_FID (40) #define PROTO_CR_AI_PACKET (44) #define PROTO_CR_TEAM_NUM (48) -#define PROTO_CR_FLAGS (52) #define PROTO_CR_BODY_TYPE (388) #define PROTO_CR_KILL_EXP (392) #define PROTO_CR_KILL_TYPE (396) diff --git a/artifacts/scripting/sfall opcode list.txt b/artifacts/scripting/sfall opcode list.txt index 6da70942..33983a51 100644 --- a/artifacts/scripting/sfall opcode list.txt +++ b/artifacts/scripting/sfall opcode list.txt @@ -257,8 +257,8 @@ 0x8202 - void fs_seek(int id, int pos) 0x8203 - void fs_resize(int id, int size) -0x8204 - int get_proto_data(object, int offset) -0x8205 - void set_proto_data(object, int offset, int value) +0x8204 - int get_proto_data(int pid, int offset) +0x8205 - void set_proto_data(int pid, int offset, int value) 0x8206 - void set_self(object) 0x8207 - void register_hook(int hook)