Index: class.c
==================================================================
--- class.c
+++ class.c
@@ -1039,20 +1039,20 @@
           FlowPop(OP_BEGIN);
           AddInst2(OP_GOTO,flowptr[flowdepth]);
           cl->codes[x]=ptr;
           break;
         case OP_FOR:
-          if(cl->uservars>=0x07FF || num_globals>=0x07FF) ParseError("Too many user variables\n");
-          if(cla) x=cl->uservars++|0x2000; else x=num_globals++|0x2800;
+          if(num_globals>=0x07FF) ParseError("Too many user variables\n");
+          x=num_globals++;
           AddInst2(OP_FOR,x);
           FlowPush(OP_FOR);
           peep=++ptr;
           break;
         case OP_NEXT:
           FlowPop(OP_FOR);
-          AddInst(OP_NEXT);
-          cl->codes[flowptr[flowdepth]]=ptr;
+          AddInst2(OP_NEXT,flowptr[flowdepth]);
+          cl->codes[flowptr[flowdepth]]=peep=ptr;
           break;
         case OP_STRING:
           AddInst2(OP_STRING,pool_string(tokenstr));
           break;
         default:

Index: exec.c
==================================================================
--- exec.c
+++ exec.c
@@ -414,10 +414,52 @@
   if(!cl.t && !cl.u) return NVALUE(0);
   if(cl.t!=TY_CLASS || x.t || x.t || y.t || im.t || d.t) Throw("Type mismatch");
   n=create(from,cl.u,x.u,y.u,im.u,d.u);
   return OVALUE(n);
 }
+
+static int v_for(Uint16*code,int ptr,Value v,Value xv,Value yv) {
+  int k=code[ptr];
+  Uint32 n;
+  if(xv.t || yv.t) Throw("Type mismatch");
+  if(xv.u<1 || xv.u>pfwidth || yv.u<1 || yv.u>pfheight) {
+    globals[k].t=TY_NUMBER;
+    globals[k].u=0;
+    xv.u=yv.u=0;
+  } else {
+    globals[k].t=TY_FOR;
+    globals[k].u=xv.u+yv.u*64-65;
+    if(v_bool(v)) globals[k].u|=0x10000;
+  }
+  if(xv.u || yv.u) {
+    n=playfield[globals[k].u&0xFFFF];
+    while(n!=VOIDLINK) {
+      objects[n]->oflags&=~OF_DONE;
+      n=objects[n]->up;
+    }
+  }
+  return code[ptr+1]-2; // This will cause "next" to be executed next
+}
+
+static int v_next(Uint16*code,int ptr) {
+  int k=code[code[ptr]-1];
+  Uint32 n;
+  Uint32 r=VOIDLINK;
+  if(globals[k].t!=TY_FOR) Throw("Uninitialized for/next loop");
+  n=playfield[globals[k].u&0xFFFF];
+  while(n!=VOIDLINK) {
+    if(!(objects[n]->oflags&OF_DONE)) {
+      r=n;
+      if(globals[k].u&0x10000) break;
+    }
+    n=objects[n]->up;
+  }
+  if(r==VOIDLINK) return ptr+1;
+  objects[r]->oflags|=OF_DONE;
+  Push(OVALUE(r));
+  return code[ptr]+1;
+}
 
 static inline Value v_obj_class_at(Value c,Value x,Value y) {
   Uint32 i;
   if(c.t==TY_NUMBER && !c.u) return NVALUE(0);
   if(c.t!=TY_CLASS || x.t!=TY_NUMBER || y.t!=TY_NUMBER) Throw("Type mismatch");
@@ -518,12 +560,12 @@
     case OP_BROADCASTEX_D: StackReq(5,0); t5=Pop(); t4=Pop(); t3=Pop(); t2=Pop(); t1=Pop(); v_broadcast(obj,t1,t2,t3,t4,t5,0); break;
     case OP_BROADCASTSUM: StackReq(4,1); t4=Pop(); t3=Pop(); t2=Pop(); t1=Pop(); Push(v_broadcast(obj,t1,t2,t3,t4,NVALUE(0),1)); break;
     case OP_BROADCASTSUMEX: StackReq(5,1); t5=Pop(); t4=Pop(); t3=Pop(); t2=Pop(); t1=Pop(); Push(v_broadcast(obj,t1,t2,t3,t4,t5,1)); break;
     case OP_BUSY: StackReq(0,1); if(o->oflags&OF_BUSY) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_BUSY_C: StackReq(1,1); GetFlagOf(OF_BUSY); break;
-    case OP_BUSY_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_BUSY; else o->oflags&=~OF_BUSY; break;
-    case OP_BUSY_EC: StackReq(2,0); SetFlagOf(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_CLASS: StackReq(0,1); Push(CVALUE(o->class)); break;
     case OP_CLASS_C: StackReq(1,1); Push(GetVariableOf(class,CVALUE)); break;
     case OP_CLIMB: StackReq(0,1); Push(NVALUE(o->climb)); break;
@@ -563,10 +605,11 @@
     case OP_DIV_C: StackReq(2,1); t2=Pop(); DivideBy(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.s/t2.s)); break;
     case OP_DROP: StackReq(1,0); Pop(); break;
     case OP_DROP_D: StackReq(2,0); Pop(); Pop(); break;
     case OP_DUP: StackReq(1,2); t1=Pop(); Push(t1); Push(t1); break;
     case OP_EQ: StackReq(2,1); t2=Pop(); t1=Pop(); Push(NVALUE(v_equal(t1,t2)?1:0)); break;
+    case OP_FOR: NoIgnore(); StackReq(3,1); t3=Pop(); t2=Pop(); t1=Pop(); ptr=v_for(code,ptr,t1,t2,t3); break;
     case OP_FROM: StackReq(0,1); Push(OVALUE(msgvars.from)); break;
     case OP_GE: StackReq(2,1); t2=Pop(); t1=Pop(); Push(NVALUE(v_unsigned_greater(t2,t1)?0:1)); break;
     case OP_GE_C: StackReq(2,1); t2=Pop(); t1=Pop(); Push(NVALUE(v_signed_greater(t2,t1)?0:1)); break;
     case OP_GOTO: ptr=code[ptr]; break;
     case OP_GT: StackReq(2,1); t2=Pop(); t1=Pop(); Push(NVALUE(v_unsigned_greater(t1,t2)?1:0)); break;
@@ -588,12 +631,12 @@
     case OP_IMAGE_EC: NoIgnore(); StackReq(2,0); t1=Pop(); Numeric(t1); i=v_object(Pop()); if(i!=VOIDLINK) objects[i]->image=t1.u; break;
     case OP_INT16: StackReq(0,1); Push(NVALUE(code[ptr++])); break;
     case OP_INT32: StackReq(0,1); t1=UVALUE(code[ptr++]<<16,TY_NUMBER); t1.u|=code[ptr++]; Push(t1); break;
     case OP_INVISIBLE: StackReq(0,1); if(o->oflags&OF_INVISIBLE) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_INVISIBLE_C: StackReq(1,1); GetFlagOf(OF_INVISIBLE); break;
-    case OP_INVISIBLE_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_INVISIBLE; else o->oflags&=~OF_INVISIBLE; break;
-    case OP_INVISIBLE_EC: StackReq(2,0); SetFlagOf(OF_INVISIBLE); break;
+    case OP_INVISIBLE_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_INVISIBLE; else o->oflags&=~OF_INVISIBLE; break;
+    case OP_INVISIBLE_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_INVISIBLE); break;
     case OP_KEY: StackReq(0,1); Push(NVALUE(current_key)); break;
     case OP_KEYCLEARED: StackReq(0,1); if(o->oflags&OF_KEYCLEARED) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_KEYCLEARED_C: StackReq(1,1); GetFlagOf(OF_KEYCLEARED); break;
     case OP_KEYCLEARED_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_KEYCLEARED; else o->oflags&=~OF_KEYCLEARED; break;
     case OP_KEYCLEARED_EC: StackReq(2,0); SetFlagOf(OF_KEYCLEARED); break;
@@ -609,17 +652,18 @@
     case OP_LXOR: StackReq(2,1); t1=Pop(); t2=Pop(); if(v_bool(t1)?!v_bool(t2):v_bool(t2)) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_MOD: StackReq(2,1); t2=Pop(); DivideBy(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.u%t2.u)); break;
     case OP_MOD_C: StackReq(2,1); t2=Pop(); DivideBy(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.s%t2.s)); break;
     case OP_MOVED: StackReq(0,1); if(o->oflags&OF_MOVED) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_MOVED_C: StackReq(1,1); GetFlagOf(OF_MOVED); break;
-    case OP_MOVED_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_MOVED; else o->oflags&=~OF_MOVED; break;
-    case OP_MOVED_EC: StackReq(2,0); SetFlagOf(OF_MOVED); break;
+    case OP_MOVED_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_MOVED; else o->oflags&=~OF_MOVED; break;
+    case OP_MOVED_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_MOVED); break;
     case OP_MSG: StackReq(0,1); Push(MVALUE(msgvars.msg)); break;
     case OP_MUL: StackReq(2,1); t2=Pop(); Numeric(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.u*t2.u)); break;
     case OP_MUL_C: StackReq(2,1); t2=Pop(); Numeric(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.s*t2.s)); break;
     case OP_NE: StackReq(2,1); t2=Pop(); t1=Pop(); Push(NVALUE(v_equal(t1,t2)?0:1)); break;
     case OP_NEG: StackReq(1,1); t1=Pop(); Numeric(t1); t1.s=-t1.s; Push(t1); break;
+    case OP_NEXT: StackReq(0,1); ptr=v_next(code,ptr); break;
     case OP_NIP: StackReq(2,1); t1=Pop(); Pop(); Push(t1); break;
     case OP_OBJABOVE: StackReq(0,1); i=obj_above(obj); Push(OVALUE(i)); break;
     case OP_OBJABOVE_C: StackReq(1,1); i=obj_above(v_object(Pop())); Push(OVALUE(i)); break;
     case OP_OBJBELOW: StackReq(0,1); i=obj_below(obj); Push(OVALUE(i)); break;
     case OP_OBJBELOW_C: StackReq(1,1); i=obj_below(v_object(Pop())); Push(OVALUE(i)); break;
@@ -652,12 +696,12 @@
     case OP_SHOVABLE_C: StackReq(1,1); Push(GetVariableOrAttributeOf(shovable,NVALUE)); break;
     case OP_SHOVABLE_E: NoIgnore(); StackReq(1,0); t1=Pop(); Numeric(t1); o->shovable=t1.u; break;
     case OP_SHOVABLE_EC: NoIgnore(); StackReq(2,0); t1=Pop(); Numeric(t1); i=v_object(Pop()); if(i!=VOIDLINK) objects[i]->shovable=t1.u; break;
     case OP_STEALTHY: StackReq(0,1); if(o->oflags&OF_STEALTHY) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_STEALTHY_C: StackReq(1,1); GetFlagOf(OF_STEALTHY); break;
-    case OP_STEALTHY_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_STEALTHY; else o->oflags&=~OF_STEALTHY; break;
-    case OP_STEALTHY_EC: StackReq(2,0); SetFlagOf(OF_STEALTHY); break;
+    case OP_STEALTHY_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_STEALTHY; else o->oflags&=~OF_STEALTHY; break;
+    case OP_STEALTHY_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_STEALTHY); break;
     case OP_STRENGTH: StackReq(0,1); Push(NVALUE(o->strength)); break;
     case OP_STRENGTH_C: StackReq(1,1); Push(GetVariableOrAttributeOf(strength,NVALUE)); break;
     case OP_STRENGTH_E: NoIgnore(); StackReq(1,0); t1=Pop(); Numeric(t1); o->strength=t1.u; break;
     case OP_STRENGTH_E16: NoIgnore(); StackReq(1,0); t1=Pop(); Numeric(t1); o->strength=t1.u&0xFFFF; break;
     case OP_STRENGTH_EC: NoIgnore(); StackReq(2,0); t1=Pop(); Numeric(t1); i=v_object(Pop()); if(i!=VOIDLINK) o->strength=t1.u; break;
@@ -666,20 +710,20 @@
     case OP_SUB: StackReq(2,1); t2=Pop(); Numeric(t2); t1=Pop(); Numeric(t1); Push(NVALUE(t1.u-t2.u)); break;
     case OP_SWAP: StackReq(2,2); t1=Pop(); t2=Pop(); Push(t1); Push(t2); break;
     case OP_TRACE: StackReq(3,0); trace_stack(obj); break;
     case OP_USERSTATE: StackReq(0,1); if(o->oflags&OF_USERSTATE) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_USERSTATE_C: StackReq(1,1); GetFlagOf(OF_USERSTATE); break;
-    case OP_USERSTATE_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_USERSTATE; else o->oflags&=~OF_USERSTATE; break;
-    case OP_USERSTATE_EC: StackReq(2,0); SetFlagOf(OF_USERSTATE); break;
+    case OP_USERSTATE_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_USERSTATE; else o->oflags&=~OF_USERSTATE; break;
+    case OP_USERSTATE_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_USERSTATE); break;
     case OP_USERSIGNAL: StackReq(0,1); if(o->oflags&OF_USERSIGNAL) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_USERSIGNAL_C: StackReq(1,1); GetFlagOf(OF_USERSIGNAL); break;
-    case OP_USERSIGNAL_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_USERSIGNAL; else o->oflags&=~OF_USERSIGNAL; break;
-    case OP_USERSIGNAL_EC: StackReq(2,0); SetFlagOf(OF_USERSIGNAL); break;
+    case OP_USERSIGNAL_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_USERSIGNAL; else o->oflags&=~OF_USERSIGNAL; break;
+    case OP_USERSIGNAL_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_USERSIGNAL); break;
     case OP_VISUALONLY: StackReq(0,1); if(o->oflags&OF_VISUALONLY) Push(NVALUE(1)); else Push(NVALUE(0)); break;
     case OP_VISUALONLY_C: StackReq(1,1); GetFlagOf(OF_VISUALONLY); break;
-    case OP_VISUALONLY_E: StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_VISUALONLY; else o->oflags&=~OF_VISUALONLY; break;
-    case OP_VISUALONLY_EC: StackReq(2,0); SetFlagOf(OF_VISUALONLY); break;
+    case OP_VISUALONLY_E: NoIgnore(); StackReq(1,0); if(v_bool(Pop())) o->oflags|=OF_VISUALONLY; else o->oflags&=~OF_VISUALONLY; break;
+    case OP_VISUALONLY_EC: NoIgnore(); StackReq(2,0); SetFlagOf(OF_VISUALONLY); break;
     case OP_VOLUME: StackReq(0,1); Push(NVALUE(o->volume)); break;
     case OP_VOLUME_C: StackReq(1,1); Push(GetVariableOrAttributeOf(volume,NVALUE)); break;
     case OP_VOLUME_E: NoIgnore(); StackReq(1,0); t1=Pop(); Numeric(t1); o->volume=t1.u; break;
     case OP_VOLUME_E16: NoIgnore(); StackReq(1,0); t1=Pop(); Numeric(t1); o->volume=t1.u&0xFFFF; break;
     case OP_VOLUME_EC: NoIgnore(); StackReq(2,0); t1=Pop(); Numeric(t1); i=v_object(Pop()); if(i!=VOIDLINK) o->volume=t1.u; break;
@@ -825,10 +869,11 @@
 }
 
 const char*init_level(void) {
   if(setjmp(my_env)) return my_error;
   if(main_options['t']) printf("[Level %d restarted]\n",level_id);
+  memcpy(globals,initglobals,sizeof(globals));
   gameover=0;
   changed=0;
   key_ignored=0;
   lastimage_processing=0;
   vstackptr=0;

Index: heromesh.h
==================================================================
--- heromesh.h
+++ heromesh.h
@@ -12,10 +12,11 @@
 #define TY_MESSAGE 2
 #define TY_LEVELSTRING 3
 #define TY_STRING 4
 #define TY_SOUND 5
 #define TY_USOUND 6
+#define TY_FOR 7
 #define TY_MAXTYPE 15
 // The level file format requires type codes 0 to 3 to be as is; other codes may change.
 
 typedef struct {
   union {