Index: exec.c
==================================================================
--- exec.c
+++ exec.c
@@ -11,10 +11,11 @@
 #include "sqlite3.h"
 #include "smallxrm.h"
 #include "heromesh.h"
 #include "instruc.h"
 
+Uint32 max_objects;
 Uint32 generation_number;
 Object**objects;
 Uint32 nobjects;
 Value globals[0x800];
 Uint32 firstobj=VOIDLINK;
@@ -62,14 +63,17 @@
   }
 }
 
 #define OBJECT_ARRAY_BLOCK 256
 Uint32 objalloc(Uint16 c) {
-  // c must be a valid (nonzero) class number, and not a class with CF_GROUP, CF_NOCLASS1, or CF_NOCLASS2 flags.
+  // Allocates a new object of the given class; links into the event list but not into the playfield.
+  // Does not send any messages or otherwise notify anyone that it has been created.
+  // Returns VOIDLINK if object cannot be created.
   Uint32 n;
   Class*cl=classes[c];
   Object*o=calloc(1,sizeof(Object)+cl->uservars*sizeof(Value));
+  if(!c || !cl || cl->cflags&(CF_GROUP|CF_NOCLASS1|CF_NOCLASS2)) goto bad;
   if(!o) fatal("Allocation failed\n");
   o->class=c;
   o->generation=generation_number;
 #define C(x) o->x=cl->x;
   C(height) C(weight) C(climb) C(density) C(volume) C(strength) C(arrivals) C(departures) C(temperature)
@@ -83,11 +87,11 @@
   o->misc7=NVALUE(cl->misc7);
   if(nobjects) for(n=nobjects-1;;n--) {
     if(!objects[n]) goto found;
     if(!n) break;
   }
-  if(nobjects>=0xFFFF0000L) fatal("Too many objects\n");
+  if(nobjects>=max_objects) goto bad;
   objects=realloc(objects,(nobjects+OBJECT_ARRAY_BLOCK)*sizeof(Object*));
   if(!objects) fatal("Allocation failed\n");
   for(n=nobjects;n<nobjects+OBJECT_ARRAY_BLOCK;n++) objects[n]=0;
   n=nobjects;
   nobjects+=OBJECT_ARRAY_BLOCK;
@@ -99,10 +103,13 @@
     lastobj=n;
     if(firstobj==VOIDLINK) firstobj=n;
   }
   objects[n]=o;
   return n;
+  bad:
+  free(o);
+  return VOIDLINK;
 }
 
 static void execute_program(Uint16*code,int ptr,Uint32 obj) {
   Object*o=objects[obj];
   if(StackProtection()) Throw("Call stack overflow");

Index: heromesh.h
==================================================================
--- heromesh.h
+++ heromesh.h
@@ -166,19 +166,20 @@
   Uint8 x,y,shape,shovable,image,dir;
   Value misc1,misc2,misc3,misc4,misc5,misc6,misc7;
   Value uservars[0];
 } Object;
 
+extern Uint32 max_objects;
 extern Uint32 generation_number;
 extern Object**objects;
 extern Uint32 nobjects;
 extern Value globals[0x800];
 extern Uint32 firstobj,lastobj;
 extern Uint32 playfield[64*64];
-Uint8 pfwidth,pfheight;
+extern Uint8 pfwidth,pfheight;
 
 void pfunlink(Uint32 n);
 void pflink(Uint32 n);
 Uint32 objalloc(Uint16 c);
 void annihilate(void);
 const char*execute_turn(int key);
 

Index: main.c
==================================================================
--- main.c
+++ main.c
@@ -584,10 +584,13 @@
   stack_protect_mode=*v;
   if(*v=='?') {
     fprintf(stderr,"Stack protection test mode: %p\n",stack_protect_mark);
     stack_protect_low=stack_protect_high=stack_protect_mark;
     atexit(test_stack_protection);
+  } else if(*v=='H') {
+    v=malloc(strtoll(v+1,0,0));
+    fatal("%p %p :: %lld\n",v,stack_protect_mark,(long long)(((char*)stack_protect_mark)-v));
   }
   if(v[1]) stack_protect_mark=((char*)stack_protect_mark)+strtoll(v+1,0,0);
 }
 #endif
 
@@ -636,8 +639,9 @@
   if(main_options['x']) {
     fprintf(stderr,"Ready for executing SQL statements.\n");
     do_sql_mode();
     return 0;
   }
-  
-  return 0;
+  optionquery[1]=Q_maxObjects;
+  max_objects=strtoll(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"",0,0)?:0xFFFF0000L;
+  return 0; // for(;;) { if(main_options['e']) run_editor(); else run_game(); }
 }

Index: quarks
==================================================================
--- quarks
+++ quarks
@@ -209,6 +209,7 @@
 
 ! Miscellaneous
 level
 tracePrefix
 stackProtection
+maxObjects
 

Index: quarks.h
==================================================================
--- quarks.h
+++ quarks.h
@@ -174,10 +174,11 @@
 #define Q_sqlCoveringIndexScan 175
 #define Q_sqlPowerSafe 176
 #define Q_level 177
 #define Q_tracePrefix 178
 #define Q_stackProtection 179
+#define Q_maxObjects 180
 static const char*const global_quarks[]={
   "screenWidth",
   "screenHeight",
   "margin",
   "palette",
@@ -353,10 +354,11 @@
   "sqlCoveringIndexScan",
   "sqlPowerSafe",
   "level",
   "tracePrefix",
   "stackProtection",
+  "maxObjects",
 0};
 #ifdef HEROMESH_BINDINGS
 static const SDLKey quark_to_key[Q_undo+1-Q_backspace]={
 SDLK_BACKSPACE,
 SDLK_TAB,