--- deliantra/server/common/loader.l	2006/05/11 18:37:20	1.2
+++ deliantra/server/common/loader.l	2006/08/13 17:16:00	1.7
@@ -59,7 +59,7 @@
  * NULL entries in this table are valid - to denote objects that should
  * not be updated for whatever reason.
  */
-const char *const spell_mapping[] = {
+const char *spell_mapping[] = {
 "spell_magic_bullet",		/* 0 */
 "spell_small_fireball",		/* 1 */
 "spell_medium_fireball",	/* 2 */
@@ -327,6 +327,35 @@
     LOG(llevError,"set_body_info called with bogus params: %s\n", params);
 }
 
+// return a suitable strign describign an objetc in enough detail to find it
+// used only in check_loaded_object: TODO remove static, move it elsewhere and
+// use it in more log messages.
+static char *op_debug_info_ (object *op, char *info)
+{
+   char info2[256 * 3];
+   char *p = info;
+
+   p += snprintf (p, 256, "%d=\"%s%s%s\"",
+         op->count,
+         op->name ? op->name : "(anon)",
+         op->title ? " " : "",
+         op->title ? op->title : "");
+
+   if (op->env)
+      p += snprintf (p, 256, "(in %s)", op_debug_info_ (op->env, info2));
+
+   if (op->map)
+      p += snprintf (p, 256, "(on %s@%d+%d)", op->map->path, op->x, op->y);
+
+   return info;
+}
+
+static char *op_debug_info (object *op)
+{
+   static char info[256 * 3];
+
+   return op_debug_info_ (op, info);
+}
 
 /* This function checks the object after it has been loaded (when we
  * get the 'end' in the input stream).  This function can be used to 
@@ -365,11 +394,11 @@
      */
     if ((op->type == WEAPON || op->type==BOW) && arch_init) {
 	if (!op->skill) {
-	    LOG(llevError,"Weapon %s lacks a skill.\n", op->name);
+	    LOG(llevError,"Weapon %s lacks a skill.\n", op_debug_info (op));
 	} else if ((!strcmp(op->skill,"one handed weapons") && op->body_info[1] != -1) ||
 	    (!strcmp(op->skill,"two handed weapons") && op->body_info[1] != -2)) {
 	    LOG(llevError,"weapon %s arm usage does not match skill: %d, %s\n",
-		op->name, op->body_info[1], op->skill);
+		op_debug_info (op), op->body_info[1], op->skill);
 	}
     }
 
@@ -384,8 +413,7 @@
         (op->type == AMULET )  || (op->type == GIRDLE) ||
         (op->type == BRACERS ) || (op->type == CLOAK)) {
 	if (op->last_heal) {
-	    LOG(llevDebug,"Object %s still has last_heal set, not gen_sp_armour\n",
-		op->name?op->name:"NULL");
+	    LOG(llevDebug,"Object %s still has last_heal set, not gen_sp_armour\n", op_debug_info (op));
 	    op->gen_sp_armour = op->last_heal;
 	    op->last_heal = 0;
 	}
@@ -394,8 +422,7 @@
 	/* Legacy objects from before item power was in the game */
 	if (!op->item_power && ip) {
 	    if (ip > 3) {
-		LOG(llevDebug,"Object %s had no item power, using %d\n", 
-		    op->name?op->name:"NULL", ip);
+		LOG(llevDebug,"Object %s had no item power, using %d\n", op_debug_info (op), ip);
 	    }
 	    op->item_power = ip;
 	}
@@ -407,7 +434,7 @@
 	 */
 	if (ip > 2 *op->item_power && ip > (op->item_power + 3)) {
 	    LOG(llevDebug,"Object %s seems to have too low item power? %d > %d\n",
-		op->name?op->name:"NULL", ip, op->item_power);
+		op_debug_info (op), ip, op->item_power);
 	}
 
     }
@@ -440,7 +467,7 @@
     if (QUERY_FLAG(op, FLAG_MONSTER)) {
 	if (op->stats.hp > op->stats.maxhp)
 	    LOG(llevDebug,"Monster %s has hp set higher than maxhp (%d>%d)\n",
-		op->name,
+		op_debug_info (op),
 		op->stats.hp, op->stats.maxhp);
 
 	/* The archs just need to be updated for this */
@@ -618,13 +645,17 @@
 
 ^msg{WS}$	    {	BEGIN( MESSAGE ); msgbuf[0]='\0'; }
 <MESSAGE>^endmsg{WS}$ {	BEGIN( INITIAL );
-			op->msg=add_string(msgbuf);
 			/* Just print a warning so we can be reasonably safe
 			 * about not overflowing the buffer.
 			 */
-			if (strlen(op->msg) > (HUGE_BUF/2))
-			    LOG(llevDebug, "\n\tWarning message length > %d (max allowed=%d): %d\n>%.80s<\n",
-				HUGE_BUF/2, HUGE_BUF, strlen(op->msg),op->msg);
+			if (strlen(msgbuf) >= HUGE_BUF)
+                          {
+			    LOG(llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n",
+				HUGE_BUF, strlen(op->msg),op->msg);
+                            op->msg = add_string ("ERROR, please report: string too long, winged.\n");
+                          }
+                        else
+                          op->msg = add_string (msgbuf);
 		    }
 <MESSAGE>.*	    {strcat(msgbuf, yytext); strcat(msgbuf,"\n"); }
 
@@ -955,7 +986,7 @@
     /* Old style resistances */
 ^immune{S}		set_protection(op, IVAL, RESIST_IMMUNE);
 ^protected{S}		set_protection(op, IVAL, RESIST_PROT);
-^vulnerable{S}		set_protection(op, IVAL, RESIST_VULN);
+^vulnerable{S}		set_protection(op, IVAL, (uint16) RESIST_VULN);
 
     /* old values - keep them around for now, but they should be removed at some point */
 ^has_ready_rod{S}	SET_OR_CLEAR_FLAG(op, FLAG_READY_RANGE, IVAL);
@@ -1004,7 +1035,7 @@
 ^can_dam_armour{S}	{ }
 ^weapontype{S}		op->weapontype = IVAL;
 ^tooltype{S}            op->tooltype = IVAL;
-^casting_time{S}	op->casting_time = FVAL;
+^casting_time{S}	op->casting_time = (sint16) FVAL;
 ^elevation{S}		op->elevation = IVAL;
 ^smoothlevel{S}		op->smoothlevel = IVAL;
 ^client_type{S}		op->client_type = IVAL;
@@ -1618,17 +1649,11 @@
  */
   static int already_run = 0;
   static int flag_lens[NUM_FLAGS];
-  static char buf2[HUGE_BUF];
-  static char buf[HUGE_BUF];
-  char* fastbuf;
+  char buf2[4096];            //  / was HUFE_BUF, which was hugely incorrect, as is this value, but much less so
+  static char buf[128*1024];  // <  the assumption is that every object always fits. fixing this bug, however
+  char* fastbuf;              //  \ requires a large rewrite of the code, so its left to the next total rewrite.
   int tmp;
   int i;
-#if 0
-/*Memory polluting code. Should help detect problems, very slow*/
-  for (i=0;i<HUGE_BUF;i++){
-    buf[i]='a'+(unsigned short)(i%25);
-  }
-#endif
   event *etmp;
   event *etmp2;
   key_value * my_field;
@@ -1969,7 +1994,7 @@
     }
 
     if (op->move_slow_penalty != op2->move_slow_penalty) {
-	FAST_SAVE_LONG(fastbuf,"move_slow_penalty ",op->move_slow_penalty,18);
+	FAST_SAVE_LONG(fastbuf,"move_slow_penalty ",(long) op->move_slow_penalty,18);
     }
 
     if (!COMPARE_FLAGS(op,op2)) {