--- deliantra/server/common/loader.C 2009/10/12 14:00:57 1.134 +++ deliantra/server/common/loader.C 2009/11/04 00:02:48 1.136 @@ -996,7 +996,10 @@ : treasurelist::find (f.get_str ()); if (!randomitems) - LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); + { + LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); + randomitems = treasurelist::get (shstr_none); // avoid crashes + } } else randomitems = 0; @@ -1101,57 +1104,6 @@ return op->parse_kv (f); } -/* This returns a string of the integer movement type */ -#if 0 -// unused function -static char * -get_string_move_type (MoveType mt) -{ - static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; - int i, all_count = 0, count; - - strcpy (retbuf, ""); - strcpy (retbuf_all, " all"); - - /* Quick check, and probably fairly common */ - if (mt == MOVE_ALL) - return retbuf_all + 1; - if (mt == 0) - { - strcpy (retbuf, "0"); - return retbuf; - } - - /* We basically slide the bits down. Why look at MOVE_ALL? - * because we may want to return a string like 'all -swim', - * and if we just looked at mt, we couldn't get that. - */ - for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) - { - if (mt & (1 << count)) - { - strcat (retbuf, " "); - strcat (retbuf, move_name[count]); - } - else - { - strcat (retbuf_all, " -"); - strcat (retbuf_all, move_name[count]); - all_count++; - } - } - /* Basically, if there is a single negation, return it, eg - * 'all -swim'. But more than that, just return the - * enumerated values. It doesn't make sense to return - * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' - */ - if (all_count <= 1) - return retbuf_all + 1; - else - return retbuf + 1; -} -#endif - // compare *op against *tmp and output differences static void write_diff (object_freezer &f, object *op, object *tmp)