Index: class.doc ================================================================== --- class.doc +++ class.doc @@ -1406,10 +1406,18 @@ c? ( any -- bool ) True if the value is a class, or false if it is any other type. Error if it is a sound. +CancelTriggers ( -- bits ) ** + Cancel all triggers for this object, including Moved, Departed, and + Arrived. The return value has bit0 set for Moved, bit1 set for Departed, + and bit2 set for Arrived, according to which triggers have been pending. + +,CancelTriggers ( obj -- bits ) ** + Like CancelTriggers but for a specified object instead of this one. + (case ) ( any -- ??? ) A case block. Read one value from stack; find which case it matches, and then push or jump to the result for that case. See the section below about case blocks for details. @@ -1481,10 +1489,21 @@ of which data block in the string to read; all of the data in that block is pushed to the stack. If there isn't enough data blocks, then nothing will be pushed to the stack. If the index is the KEY message, then all of the key codes of the quiz buttons in the string are push to stack. +DeferTriggers ( -- ) ** + Any triggers that would be executed during the current loop of triggers + is deferred until the next such loop; the Arrived, Departed, and Moved + variables are updated with the triggers that would have been done so + that they will be set to be executed during the next trigger loop. If + the Compatible flag is set then the meaning is a bit different and the + Arrived, Departed, and Moved variables are unchanged. + +,DeferTriggers ( obj -- ) ** + Like DeferTriggers but for a specified object instead of this one. + DelInventory ( class image -- ) ** Delete an item from the inventory; see SetInventory for more details. Delta ( in1 in2 -- out ) Subtracts the smaller input from the larger (unsigned). Index: exec.c ================================================================== --- exec.c +++ exec.c @@ -2936,10 +2936,32 @@ m=objects[n]->up; v_trigger(from,n,v); n=m; } } + +static Uint32 cancel_triggers(Uint32 obj) { + Object*o=objects[obj]; + Uint8 r=0; + if(o->oflags&(OF_MOVED|OF_MOVED2)) r|=0x01,o->oflags&=~(OF_MOVED|OF_MOVED2); + if(o->departed2 || o->departed) r|=0x02,o->departed2=o->departed=0; + if(o->arrived2 || o->arrived) r|=0x04,o->arrived2=o->arrived=0; + return r; +} + +static void defer_triggers(Uint32 obj) { + Object*o=objects[obj]; + if(classes[o->class]->cflags&CF_COMPATIBLE) { + o->arrived2=o->departed2=1; + o->oflags|=OF_MOVED2; + } else { + o->arrived|=o->arrived2; + o->departed|=o->departed2; + o->arrived2=o->departed2=0; + if(o->oflags&OF_MOVED2) o->oflags=(o->oflags|OF_MOVED)&~OF_MOVED2; + } +} static void v_sweep(Uint32 from,Value arg3) { Value arg2=Pop(); Value arg1=Pop(); Value v=Pop(); @@ -3232,10 +3254,12 @@ case OP_BUSY_C: StackReq(1,1); GetFlagOf(OF_BUSY); break; case OP_BUSY_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_BUSY; else o->oflags&=~OF_BUSY; break; case OP_BUSY_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_BUSY); break; case OP_BXOR: StackReq(2,1); t2=Pop(); Numeric(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.u^t2.u)); break; case OP_CALLSUB: execute_program(code,code[ptr++],obj); break; + case OP_CANCELTRIGGERS: NoIgnore(); StackReq(0,1); i=cancel_triggers(obj); Push(NVALUE(i)); break; + case OP_CANCELTRIGGERS_C: NoIgnore(); StackReq(1,1); i=v_object(Pop()); if(i!=VOIDLINK) i=cancel_triggers(i); Push(NVALUE(i)); break; case OP_CASE: StackReq(1,1); t1=Pop(); ptr=v_case(code,ptr,t1); break; case OP_CHAIN: StackReq(1,1); t1=Pop(); i=v_chain(t1,o->class); if(i==VOIDLINK) { Push(NVALUE(1)); } else { o=objects[obj=i]; Push(NVALUE(0)); } break; case OP_CHEBYSHEV: StackReq(1,1); t1=Pop(); i=chebyshev(obj,v_object(t1)); Push(NVALUE(i)); break; case OP_CHEBYSHEV_C: StackReq(2,1); t2=Pop(); t1=Pop(); i=chebyshev(v_object(t1),v_object(t2)); Push(NVALUE(i)); break; case OP_CLASS: StackReq(0,1); Push(CVALUE(o->class)); break; @@ -3267,10 +3291,12 @@ case OP_CRUSH: StackReq(0,1); if(o->oflags&OF_CRUSH) Push(NVALUE(1)); else Push(NVALUE(0)); break; case OP_CRUSH_C: StackReq(1,1); GetFlagOf(OF_CRUSH); break; case OP_CRUSH_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_CRUSH; else o->oflags&=~OF_CRUSH; break; case OP_CRUSH_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_CRUSH); break; case OP_DATA: StackReq(2,1); t2=Pop(); t1=Pop(); v_data(t1,t2); break; + case OP_DEFERTRIGGERS: NoIgnore(); defer_triggers(obj); break; + case OP_DEFERTRIGGERS_C: NoIgnore(); StackReq(1,0); i=v_object(Pop()); if(i!=VOIDLINK) defer_triggers(i); break; case OP_DELINVENTORY: StackReq(2,0); t2=Pop(); t1=Pop(); v_delete_inventory(t1,t2); break; case OP_DELTA: StackReq(2,1); t2=Pop(); Numeric(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.u>t2.u?t1.u-t2.u:t2.u-t1.u)); break; case OP_DENSITY: StackReq(0,1); Push(NVALUE(o->density)); break; case OP_DENSITY_C: StackReq(1,1); Push(GetVariableOrAttributeOf(density,NVALUE)); break; case OP_DENSITY_E: NoIgnore(); StackReq(1,0); t1=Pop(); Numeric(t1); change_density(obj,t1.s); break; Index: instruc ================================================================== --- instruc +++ instruc @@ -239,16 +239,18 @@ .BroadcastEx ; broadcast with three arguments BroadcastList ; Broadcast, pushing results to stack BroadcastListEx BroadcastSum ; Broadcast, but result is sum of return values BroadcastSumEx +,CancelTriggers chain ,Chebyshev ,Coloc ,Connect .Create Data +,DeferTriggers DelInventory Delta .,Destroy ,FakeMove ,FindConnection Index: instruc.h ================================================================== --- instruc.h +++ instruc.h @@ -346,203 +346,207 @@ #define OP_BROADCASTEX_D 41123 #define OP_BROADCASTLIST 32932 #define OP_BROADCASTLISTEX 32933 #define OP_BROADCASTSUM 32934 #define OP_BROADCASTSUMEX 32935 -#define OP_CHAIN 32936 -#define OP_CHEBYSHEV 32937 -#define OP_CHEBYSHEV_C 34985 -#define OP_COLOC 32938 -#define OP_COLOC_C 34986 -#define OP_CONNECT 32939 -#define OP_CONNECT_C 34987 -#define OP_CREATE 32940 -#define OP_CREATE_D 41132 -#define OP_DATA 32941 -#define OP_DELINVENTORY 32942 -#define OP_DELTA 32943 -#define OP_DESTROY 32944 -#define OP_DESTROY_C 34992 -#define OP_DESTROY_D 41136 -#define OP_DESTROY_CD 43184 -#define OP_FAKEMOVE 32945 -#define OP_FAKEMOVE_C 34993 -#define OP_FINDCONNECTION 32946 -#define OP_FINDCONNECTION_C 34994 -#define OP_FLUSHCLASS 32947 -#define OP_FLUSHOBJ 32948 -#define OP_FLUSHOBJ_C 34996 -#define OP_GETINVENTORY 32949 -#define OP_HEIGHTAT 32950 -#define OP_HITME 32951 -#define OP_IGNOREKEY 32952 -#define OP_INTMOVE 32953 -#define OP_INTMOVE_C 35001 -#define OP_INTMOVE_D 41145 -#define OP_INTMOVE_CD 43193 -#define OP_JUMPTO 32954 -#define OP_JUMPTO_C 35002 -#define OP_JUMPTO_D 41146 -#define OP_JUMPTO_CD 43194 -#define OP_LOC 32955 -#define OP_LOC_C 35003 -#define OP_LOCATEME 32956 -#define OP_LOCATEME_C 35004 -#define OP_LOSELEVEL 32957 -#define OP_MANHATTAN 32958 -#define OP_MANHATTAN_C 35006 -#define OP_MAXINVENTORY 32959 -#define OP_MORTON 32960 -#define OP_MORTON_C 35008 -#define OP_MOVE 32961 -#define OP_MOVE_C 35009 -#define OP_MOVE_D 41153 -#define OP_MOVE_CD 43201 -#define OP_MOVEPLUS 32962 -#define OP_MOVEPLUS_C 35010 -#define OP_MOVEPLUS_D 41154 -#define OP_MOVEPLUS_CD 43202 -#define OP_MOVETO 32963 -#define OP_MOVETO_C 35011 -#define OP_MOVETO_D 41155 -#define OP_MOVETO_CD 43203 -#define OP_PLUSMOVE 32964 -#define OP_PLUSMOVE_C 35012 -#define OP_PLUSMOVE_D 41156 -#define OP_PLUSMOVE_CD 43204 -#define OP_MINUSMOVE 32965 -#define OP_MINUSMOVE_C 35013 -#define OP_MINUSMOVE_D 41157 -#define OP_MINUSMOVE_CD 43205 -#define OP_NEWX 32966 -#define OP_NEWXY 32967 -#define OP_NEWY 32968 -#define OP_OBJABOVE 32969 -#define OP_OBJABOVE_C 35017 -#define OP_OBJBELOW 32970 -#define OP_OBJBELOW_C 35018 -#define OP_OBJBOTTOMAT 32971 -#define OP_OBJCLASSAT 32972 -#define OP_OBJDIR 32973 -#define OP_OBJDIR_C 35021 -#define OP_OBJLAYERAT 32974 -#define OP_OBJMOVINGTO 32975 -#define OP_OBJTOPAT 32976 -#define OP_POPUP 32977 -#define OP_POPUPARGS 32978 -#define OP_REL 32979 -#define OP_REL_C 35027 -#define OP_REPLACE 32980 -#define OP_REPLACE_D 41172 -#define OP_SEEK 32981 -#define OP_SEEK_C 35029 -#define OP_SEND 32982 -#define OP_SEND_C 35030 -#define OP_SEND_D 41174 -#define OP_SEND_CD 43222 -#define OP_SENDEX 32983 -#define OP_SENDEX_C 35031 -#define OP_SENDEX_D 41175 -#define OP_SENDEX_CD 43223 -#define OP_SETINVENTORY 32984 -#define OP_SOUND 32985 -#define OP_SWEEP 32986 -#define OP_SWEEPEX 32987 -#define OP_SYNCHRONIZE 32988 -#define OP_TARGET 32989 -#define OP_TARGET_C 35037 -#define OP_TRACE 32990 -#define OP_TRACESTACK 32991 -#define OP_TRACESTACK_C 35039 -#define OP_TRIGGER 32992 -#define OP_TRIGGERAT 32993 -#define OP_VOLUMEAT 32994 -#define OP_WALKABLE 32995 -#define OP_WALKABLE_C 35043 -#define OP_WINLEVEL 32996 -#define OP_WINLEVEL_C 35044 -#define OP_XDIR 32997 -#define OP_XDIR_C 35045 -#define OP_XSTEP 32998 -#define OP_XSTEP_C 35046 -#define OP_XYDIR 32999 -#define OP_YDIR 33000 -#define OP_YDIR_C 35048 -#define OP_YSTEP 33001 -#define OP_YSTEP_C 35049 -#define OP_MARK 33002 -#define OP_TMARK 33003 -#define OP_IN 33004 -#define OP_NIN 33005 -#define OP_MBEGIN 33006 -#define OP_FLIP 33007 -#define OP_COUNT 33008 -#define OP_CLEAR 33009 -#define OP_UNIQ 33010 -#define OP_ARRAY 33011 -#define OP_GETARRAY 33012 -#define OP_GETARRAY_C 35060 -#define OP_INITARRAY 33013 -#define OP_SETARRAY 33014 -#define OP_SETARRAY_C 35062 -#define OP_ARRAYCELL 33015 -#define OP_ARRAYCELL_C 35063 -#define OP_ARRAYSLICE 33016 -#define OP_COPYARRAY 33017 -#define OP_DOTPRODUCT 33018 -#define OP_PATTERN 33019 -#define OP_PATTERN_C 35067 -#define OP_PATTERN_E 37115 -#define OP_PATTERN_EC 39163 -#define OP_PATTERNS 33020 -#define OP_PATTERNS_C 35068 -#define OP_PATTERNS_E 37116 -#define OP_PATTERNS_EC 39164 -#define OP_ROOK 33021 -#define OP_BISHOP 33022 -#define OP_QUEEN 33023 -#define OP_CUT 33024 -#define OP_BIZARRO 33025 -#define OP_BIZARRO_C 35073 -#define OP_BIZARRO_E 37121 -#define OP_BIZARRO_EC 39169 -#define OP_BIZARROSWAP 33026 -#define OP_BIZARROSWAP_D 41218 -#define OP_SWAPWORLD 33027 -#define OP_ABSTRACT 33028 -#define OP_SUPER 33029 -#define OP_SUPER_C 35077 -#define OP_FUNCTION 33030 -#define OP_LOCAL 33031 -#define OP_LABEL 33032 -#define OP_STRING 33033 -#define OP_INT16 33034 -#define OP_INT32 33035 -#define OP_DISPATCH 33036 -#define OP_USERFLAG 33037 +#define OP_CANCELTRIGGERS 32936 +#define OP_CANCELTRIGGERS_C 34984 +#define OP_CHAIN 32937 +#define OP_CHEBYSHEV 32938 +#define OP_CHEBYSHEV_C 34986 +#define OP_COLOC 32939 +#define OP_COLOC_C 34987 +#define OP_CONNECT 32940 +#define OP_CONNECT_C 34988 +#define OP_CREATE 32941 +#define OP_CREATE_D 41133 +#define OP_DATA 32942 +#define OP_DEFERTRIGGERS 32943 +#define OP_DEFERTRIGGERS_C 34991 +#define OP_DELINVENTORY 32944 +#define OP_DELTA 32945 +#define OP_DESTROY 32946 +#define OP_DESTROY_C 34994 +#define OP_DESTROY_D 41138 +#define OP_DESTROY_CD 43186 +#define OP_FAKEMOVE 32947 +#define OP_FAKEMOVE_C 34995 +#define OP_FINDCONNECTION 32948 +#define OP_FINDCONNECTION_C 34996 +#define OP_FLUSHCLASS 32949 +#define OP_FLUSHOBJ 32950 +#define OP_FLUSHOBJ_C 34998 +#define OP_GETINVENTORY 32951 +#define OP_HEIGHTAT 32952 +#define OP_HITME 32953 +#define OP_IGNOREKEY 32954 +#define OP_INTMOVE 32955 +#define OP_INTMOVE_C 35003 +#define OP_INTMOVE_D 41147 +#define OP_INTMOVE_CD 43195 +#define OP_JUMPTO 32956 +#define OP_JUMPTO_C 35004 +#define OP_JUMPTO_D 41148 +#define OP_JUMPTO_CD 43196 +#define OP_LOC 32957 +#define OP_LOC_C 35005 +#define OP_LOCATEME 32958 +#define OP_LOCATEME_C 35006 +#define OP_LOSELEVEL 32959 +#define OP_MANHATTAN 32960 +#define OP_MANHATTAN_C 35008 +#define OP_MAXINVENTORY 32961 +#define OP_MORTON 32962 +#define OP_MORTON_C 35010 +#define OP_MOVE 32963 +#define OP_MOVE_C 35011 +#define OP_MOVE_D 41155 +#define OP_MOVE_CD 43203 +#define OP_MOVEPLUS 32964 +#define OP_MOVEPLUS_C 35012 +#define OP_MOVEPLUS_D 41156 +#define OP_MOVEPLUS_CD 43204 +#define OP_MOVETO 32965 +#define OP_MOVETO_C 35013 +#define OP_MOVETO_D 41157 +#define OP_MOVETO_CD 43205 +#define OP_PLUSMOVE 32966 +#define OP_PLUSMOVE_C 35014 +#define OP_PLUSMOVE_D 41158 +#define OP_PLUSMOVE_CD 43206 +#define OP_MINUSMOVE 32967 +#define OP_MINUSMOVE_C 35015 +#define OP_MINUSMOVE_D 41159 +#define OP_MINUSMOVE_CD 43207 +#define OP_NEWX 32968 +#define OP_NEWXY 32969 +#define OP_NEWY 32970 +#define OP_OBJABOVE 32971 +#define OP_OBJABOVE_C 35019 +#define OP_OBJBELOW 32972 +#define OP_OBJBELOW_C 35020 +#define OP_OBJBOTTOMAT 32973 +#define OP_OBJCLASSAT 32974 +#define OP_OBJDIR 32975 +#define OP_OBJDIR_C 35023 +#define OP_OBJLAYERAT 32976 +#define OP_OBJMOVINGTO 32977 +#define OP_OBJTOPAT 32978 +#define OP_POPUP 32979 +#define OP_POPUPARGS 32980 +#define OP_REL 32981 +#define OP_REL_C 35029 +#define OP_REPLACE 32982 +#define OP_REPLACE_D 41174 +#define OP_SEEK 32983 +#define OP_SEEK_C 35031 +#define OP_SEND 32984 +#define OP_SEND_C 35032 +#define OP_SEND_D 41176 +#define OP_SEND_CD 43224 +#define OP_SENDEX 32985 +#define OP_SENDEX_C 35033 +#define OP_SENDEX_D 41177 +#define OP_SENDEX_CD 43225 +#define OP_SETINVENTORY 32986 +#define OP_SOUND 32987 +#define OP_SWEEP 32988 +#define OP_SWEEPEX 32989 +#define OP_SYNCHRONIZE 32990 +#define OP_TARGET 32991 +#define OP_TARGET_C 35039 +#define OP_TRACE 32992 +#define OP_TRACESTACK 32993 +#define OP_TRACESTACK_C 35041 +#define OP_TRIGGER 32994 +#define OP_TRIGGERAT 32995 +#define OP_VOLUMEAT 32996 +#define OP_WALKABLE 32997 +#define OP_WALKABLE_C 35045 +#define OP_WINLEVEL 32998 +#define OP_WINLEVEL_C 35046 +#define OP_XDIR 32999 +#define OP_XDIR_C 35047 +#define OP_XSTEP 33000 +#define OP_XSTEP_C 35048 +#define OP_XYDIR 33001 +#define OP_YDIR 33002 +#define OP_YDIR_C 35050 +#define OP_YSTEP 33003 +#define OP_YSTEP_C 35051 +#define OP_MARK 33004 +#define OP_TMARK 33005 +#define OP_IN 33006 +#define OP_NIN 33007 +#define OP_MBEGIN 33008 +#define OP_FLIP 33009 +#define OP_COUNT 33010 +#define OP_CLEAR 33011 +#define OP_UNIQ 33012 +#define OP_ARRAY 33013 +#define OP_GETARRAY 33014 +#define OP_GETARRAY_C 35062 +#define OP_INITARRAY 33015 +#define OP_SETARRAY 33016 +#define OP_SETARRAY_C 35064 +#define OP_ARRAYCELL 33017 +#define OP_ARRAYCELL_C 35065 +#define OP_ARRAYSLICE 33018 +#define OP_COPYARRAY 33019 +#define OP_DOTPRODUCT 33020 +#define OP_PATTERN 33021 +#define OP_PATTERN_C 35069 +#define OP_PATTERN_E 37117 +#define OP_PATTERN_EC 39165 +#define OP_PATTERNS 33022 +#define OP_PATTERNS_C 35070 +#define OP_PATTERNS_E 37118 +#define OP_PATTERNS_EC 39166 +#define OP_ROOK 33023 +#define OP_BISHOP 33024 +#define OP_QUEEN 33025 +#define OP_CUT 33026 +#define OP_BIZARRO 33027 +#define OP_BIZARRO_C 35075 +#define OP_BIZARRO_E 37123 +#define OP_BIZARRO_EC 39171 +#define OP_BIZARROSWAP 33028 +#define OP_BIZARROSWAP_D 41220 +#define OP_SWAPWORLD 33029 +#define OP_ABSTRACT 33030 +#define OP_SUPER 33031 +#define OP_SUPER_C 35079 +#define OP_FUNCTION 33032 +#define OP_LOCAL 33033 +#define OP_LABEL 33034 +#define OP_STRING 33035 +#define OP_INT16 33036 +#define OP_INT32 33037 +#define OP_DISPATCH 33038 +#define OP_USERFLAG 33039 #ifdef HEROMESH_CLASS static const Op_Names op_names[]={ {"*",8486945}, {"+",8421407}, -{"+Move",10584260}, +{"+Move",10584262}, {"-",8421408}, -{"-Move",10584261}, +{"-Move",10584263}, {"-rot",8421382}, {".",10518528}, {"/",8486946}, {"/mod",8486948}, {"ANHH",8389393}, {"ARRIVED",8389124}, -{"Abstract",8683780}, +{"Abstract",8683782}, {"Animate",8552604}, {"AnimateDead",8552605}, {"Arg1",8552580}, {"Arg2",8552581}, {"Arg3",8552582}, -{"Array",8683763}, -{"ArrayCell",8487159}, -{"ArraySlice",8421624}, +{"Array",8683765}, +{"ArrayCell",8487161}, +{"ArraySlice",8421626}, {"Arrivals",8618095}, {"Arrived",8618093}, {"Assassinate",8487070}, {"B",9437196}, {"BANG",8389380}, @@ -555,13 +559,13 @@ {"BRRREEET",8389395}, {"BRRRT",8389394}, {"BUZZER",8389419}, {"BWEEP",8389396}, {"Background",8683662}, -{"Bishop",8683774}, -{"Bizarro",8618241}, -{"BizarroSwap",10518786}, +{"Bishop",8683776}, +{"Bizarro",8618243}, +{"BizarroSwap",10518788}, {"Broadcast",10518687}, {"BroadcastAnd",8421536}, {"BroadcastAndEx",8421537}, {"BroadcastEx",10518691}, {"BroadcastList",8421540}, @@ -577,84 +581,86 @@ {"COLLIDING",8389143}, {"CONFLICT",8389140}, {"CONNECT",8389145}, {"CREATE",8389121}, {"CREATED",8389137}, -{"Chebyshev",8487081}, +{"CancelTriggers",8487080}, +{"Chebyshev",8487082}, {"Class",8486979}, {"Climb",9142359}, {"CodePage",8683663}, {"CollisionLayers",8487039}, -{"Coloc",8487082}, +{"Coloc",8487083}, {"Compatible",8487038}, -{"Connect",8487083}, +{"Connect",8487084}, {"Connection",8618107}, {"Control",8421521}, -{"CopyArray",8421625}, -{"Create",10518700}, +{"CopyArray",8421627}, +{"Create",10518701}, {"Crush",8618112}, {"DEEP_POP",8389416}, {"DEPARTED",8389125}, {"DESTROY",8389122}, {"DESTROYED",8389136}, {"DINK",8389389}, {"DOOR",8389378}, {"DRLRLRINK",8389397}, {"DYUPE",8389412}, -{"Data",8421549}, +{"Data",8421550}, {"DefaultImage",8683671}, -{"DelInventory",8421550}, -{"Delta",8421551}, +{"DeferTriggers",8487087}, +{"DelInventory",8421552}, +{"Delta",8421553}, {"Density",9142351}, {"Departed",8618094}, {"Departures",8618096}, -{"Destroy",10584240}, +{"Destroy",10584242}, {"Destroyed",8487036}, {"Dir",8618057}, {"Distance",9142349}, {"Done",8618106}, -{"DotProduct",8421626}, +{"DotProduct",8421628}, {"E",9437184}, {"END_TURN",8389139}, {"EditorHelp",8683673}, {"F",9437192}, {"FAROUT",8389420}, {"FFFFTT",8389398}, {"FLOATED",8389132}, {"FROG",8389383}, -{"FakeMove",8487089}, -{"FindConnection",8487090}, +{"FakeMove",8487091}, +{"FindConnection",8487092}, {"Finished",8552586}, -{"FlushClass",8421555}, -{"FlushObj",8487092}, +{"FlushClass",8421557}, +{"FlushObj",8487094}, {"From",8421507}, {"GLASS",8389379}, {"GLISSANT",8389418}, -{"GetArray",8487156}, -{"GetInventory",8421557}, +{"GetArray",8487158}, +{"GetInventory",8421559}, {"HAWK",8389424}, {"HEARTBEAT",8389406}, {"HIT",8389134}, {"HITBY",8389135}, {"Hard",8618075}, {"Height",9142357}, -{"HeightAt",8421558}, +{"HeightAt",8421560}, {"Help",8683672}, -{"HitMe",8421559}, +{"HitMe",8421561}, {"INIT",8389120}, -{"IgnoreKey",8421560}, +{"IgnoreKey",8421562}, {"Image",8618058}, {"InPlace",8683670}, {"Inertia",9142347}, -{"InitArray",8421621}, +{"InitArray",8421623}, {"Input",8683668}, {"InputXY",8683667}, -{"IntMove",10584249}, +{"IntMove",10584251}, {"Invisible",8618098}, {"JAYAYAYNG",8389415}, {"JUMPED",8389128}, -{"JumpTo",10584250}, +{"JumpTo",10584252}, {"KEWEL",8389421}, {"KEY",8389129}, {"KLECK",8389387}, {"KLINKK",8389385}, {"Key",8487049}, @@ -666,137 +672,137 @@ {"LOCK",8389407}, {"LOOP",8388610}, {"LastR",8487053}, {"Level",8421512}, {"LevelTable",8683666}, -{"Loc",8487099}, -{"LocateMe",8487100}, -{"LoseLevel",8421565}, +{"Loc",8487101}, +{"LocateMe",8487102}, +{"LoseLevel",8421567}, {"MOVED",8389127}, {"MOVING",8389130}, -{"Manhattan",8487102}, -{"MaxInventory",8421567}, +{"Manhattan",8487104}, +{"MaxInventory",8421569}, {"Misc1",9142367}, {"Misc2",9142369}, {"Misc3",9142371}, {"Misc4",9142373}, {"Misc5",9142375}, {"Misc6",9142377}, {"Misc7",9142379}, -{"Morton",8487104}, -{"Move",10584257}, -{"Move+",10584258}, +{"Morton",8487106}, +{"Move",10584259}, +{"Move+",10584260}, {"MoveNumber",8552583}, -{"MoveTo",10584259}, +{"MoveTo",10584261}, {"Moved",8618104}, {"Moving",8618105}, {"Msg",8421506}, {"N",9437186}, {"NE",9437185}, {"NEXTWARP",8389146}, {"NW",9437187}, -{"NewX",8421574}, -{"NewXY",8421575}, -{"NewY",8421576}, +{"NewX",8421576}, +{"NewXY",8421577}, +{"NewY",8421578}, {"NextR",8618124}, {"OLDPHONE",8389401}, {"ONCE",8388609}, {"OSC",8388616}, {"OSCLOOP",8388618}, -{"ObjAbove",8487113}, -{"ObjBelow",8487114}, -{"ObjBottomAt",8421579}, -{"ObjClassAt",8421580}, -{"ObjDir",8487117}, -{"ObjLayerAt",8421582}, -{"ObjMovingTo",8421583}, -{"ObjTopAt",8421584}, +{"ObjAbove",8487115}, +{"ObjBelow",8487116}, +{"ObjBottomAt",8421581}, +{"ObjClassAt",8421582}, +{"ObjDir",8487119}, +{"ObjLayerAt",8421584}, +{"ObjMovingTo",8421585}, +{"ObjTopAt",8421586}, {"Order",8683664}, {"Others",8683674}, -{"P",8880379}, -{"P*",8880380}, +{"P",8880381}, +{"P*",8880382}, {"PLAYERMOVING",8389133}, {"POSTINIT",8389138}, {"POUR",8389377}, {"POWER",8389386}, {"Player",8487037}, -{"PopUp",8421585}, -{"Queen",8683775}, +{"PopUp",8421587}, +{"Queen",8683777}, {"Quiz",8487061}, {"R",9437198}, {"RATCHET1",8389417}, {"RATCHET2",8389411}, {"RATTLE",8389402}, {"RB",9437197}, {"RF",9437199}, -{"Rel",8487123}, -{"Replace",10518740}, -{"Rook",8683773}, +{"Rel",8487125}, +{"Replace",10518742}, +{"Rook",8683775}, {"S",9437190}, {"SE",9437191}, {"SMALL_POP",8389388}, {"SPLASH",8389376}, {"STEAM",8389423}, {"STOP",8388608}, {"SUBS",8683675}, {"SUNK",8389131}, {"SW",9437189}, -{"Seek",8487125}, +{"Seek",8487127}, {"Self",8421505}, -{"Send",10584278}, -{"SendEx",10584279}, -{"SetArray",8487158}, -{"SetInventory",8421592}, +{"Send",10584280}, +{"SendEx",10584281}, +{"SetArray",8487160}, +{"SetInventory",8421594}, {"Shape",8618054}, {"ShapeDir",8618077}, {"Sharp",8618076}, {"Shovable",8618078}, -{"Sound",8421593}, +{"Sound",8421595}, {"Stealthy",8618103}, {"Strength",9142361}, -{"Super",8487173}, -{"SwapWorld",8421635}, -{"Sweep",8421594}, -{"SweepEx",8421595}, -{"Synchronize",8421596}, +{"Super",8487175}, +{"SwapWorld",8421637}, +{"Sweep",8421596}, +{"SweepEx",8421597}, +{"Synchronize",8421598}, {"TAHTASHH",8389408}, {"THMP_thmp",8389404}, {"THWIT",8389384}, {"TICK",8389390}, -{"Target",8487133}, +{"Target",8487135}, {"Temperature",9142340}, {"ThisR",8618123}, -{"Trace",8421598}, -{"TraceStack",8487135}, -{"Trigger",8421600}, -{"TriggerAt",8421601}, +{"Trace",8421600}, +{"TraceStack",8487137}, +{"Trigger",8421602}, +{"TriggerAt",8421603}, {"UH_OH",8389382}, {"UNCORK",8389413}, {"UNHH",8389381}, {"UserSignal",8618100}, {"UserState",8618101}, {"VACUUM",8389410}, {"VisualOnly",8618102}, {"Volume",9142353}, -{"VolumeAt",8421602}, +{"VolumeAt",8421604}, {"W",9437188}, {"WAHOO",8389399}, {"WARPED",8389149}, {"WHACK",8389422}, -{"Walkable",8487139}, +{"Walkable",8487141}, {"Weight",9142355}, -{"WinLevel",8487140}, +{"WinLevel",8487142}, {"XCREATE",8389148}, -{"XDir",8487141}, -{"XStep",8487142}, -{"XYDir",8421607}, +{"XDir",8487143}, +{"XStep",8487144}, +{"XYDir",8421609}, {"Xloc",8486983}, -{"YDir",8487144}, +{"YDir",8487146}, {"YEEHAW",8389400}, -{"YStep",8487145}, +{"YStep",8487147}, {"Yloc",8486984}, -{"_",8421610}, +{"_",8421612}, {"a?",8421442}, {"again",8683533}, {"and",8683546}, {"band",8421418}, {"begin",8683532}, @@ -836,27 +842,27 @@ {"bnot",8421421}, {"bor",8421419}, {"bxor",8421420}, {"c?",8421436}, {"case",8683544}, -{"chain",8421544}, -{"clear",8421617}, -{"count",8421616}, -{"cut",8683776}, +{"chain",8421545}, +{"clear",8421619}, +{"count",8421618}, +{"cut",8683778}, {"cz?",8421437}, {"dup",8421377}, {"else",8683530}, {"eq",8421427}, {"eq2",8421428}, {"exec",8486942}, -{"flip",8421615}, +{"flip",8421617}, {"for",8683537}, {"fork",8683547}, {"ge",8486968}, {"gt",8486966}, {"if",8749065}, -{"in",8421612}, +{"in",8421614}, {"is",8421434}, {"land",8421423}, {"le",8486969}, {"link",8683549}, {"lnot",8421426}, @@ -864,18 +870,18 @@ {"lsh",8421416}, {"lt",8486967}, {"lxor",8421425}, {"m?",8421438}, {"max",8486951}, -{"mbegin",8683758}, +{"mbegin",8683760}, {"min",8486950}, {"mod",8486947}, {"n?",8421435}, {"ne",8421429}, {"neg",8421413}, {"next",8683538}, -{"nin",8421613}, +{"nin",8421615}, {"nip",8421379}, {"o?",8421440}, {"or",8683545}, {"over",8421384}, {"oz?",8421441}, @@ -888,13 +894,13 @@ {"rsh",8486953}, {"rtn",8683548}, {"s?",8421439}, {"swap",8421378}, {"then",8683531}, -{"tmark",8421611}, +{"tmark",8421613}, {"tuck",8421380}, -{"uniq",8421618}, +{"uniq",8421620}, {"until",8749070}, {"while",8749071}, }; -#define N_OP_NAMES 374 +#define N_OP_NAMES 376 #endif