--- deliantra/server/common/player.C 2007/01/09 21:32:41 1.18 +++ deliantra/server/common/player.C 2007/02/16 19:43:41 1.21 @@ -67,6 +67,9 @@ object *container = ob->container; ob->container = 0; + if (ob->map) + maplevel = ob->map->path; + #define PL_OUT(k) freezer.put (KW_ ## k, k) #define PL_OUT2(k,v) freezer.put (KW_ ## k, v) @@ -115,7 +118,7 @@ SET_FLAG (ob, FLAG_NO_FIX_PLAYER); CLEAR_FLAG (ob, FLAG_WIZ); - save_object (freezer, ob, 1); /* don't check and don't remove */ + ob->write (freezer); CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); @@ -141,122 +144,116 @@ } player * -player::load_pl (object_thawer &thawer) +player::load_pl (object_thawer &f) { - int maxerrs = 10; + int maxerrs = 20; player *pl = new player; pl->savebed_map = first_map_path; - /* this loads the standard objects values. */ - pl->set_object (object::create ()); - /* Loop through the file, loading the rest of the values */ for (;;) { - keyword kw = thawer.get_kv (); - - switch (kw) + switch (f.kw) { case KW_EOF: - LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); + LOG (llevError, "%s: unexpected EOF while reading player header\n", f.name); goto failure; default: - LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]); + LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str); if (!--maxerrs) goto failure; break; case KW_ERROR: - LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", thawer.name, thawer.last_keyword, thawer.last_value); + LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", f.name, f.kw_str, f.value); if (!--maxerrs) goto failure; break; case KW_endplst: - goto done; + f.next (); + + if (object *op = pl->ob->read (f)) + pl->set_object (op); + else + goto failure; + + INVOKE_PLAYER (LOAD, pl); - case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; - case KW_password: assign (pl->password , thawer.get_str ()); break; - case KW_title: assign (pl->own_title, thawer.get_str ()); break; - case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break; - case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; - case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; - case KW_listening: thawer.get (pl->listening); break; - case KW_peaceful: thawer.get (pl->peaceful); break; - case KW_digestion: thawer.get (pl->digestion); break; - case KW_pickup: thawer.get (pl->mode); break; - case KW_outputs_sync: thawer.get (pl->outputs_sync); break; - case KW_outputs_count: thawer.get (pl->outputs_count); break; - case KW_map: thawer.get (pl->maplevel); break; - case KW_savebed_map: thawer.get (pl->savebed_map); break; - case KW_bed_x: thawer.get (pl->bed_x); break; - case KW_bed_y: thawer.get (pl->bed_y); break; - case KW_weapon_sp: thawer.get (pl->weapon_sp); break; - case KW_Str: thawer.get (pl->orig_stats.Str); break; - case KW_Dex: thawer.get (pl->orig_stats.Dex); break; - case KW_Con: thawer.get (pl->orig_stats.Con); break; - case KW_Int: thawer.get (pl->orig_stats.Int); break; - case KW_Pow: thawer.get (pl->orig_stats.Pow); break; - case KW_Wis: thawer.get (pl->orig_stats.Wis); break; - case KW_Cha: thawer.get (pl->orig_stats.Cha); break; - case KW_gen_hp: thawer.get (pl->gen_hp); break; - case KW_gen_sp: thawer.get (pl->gen_sp); break; - case KW_gen_grace: thawer.get (pl->gen_grace); break; + return pl; + + case KW_oid: f.get (pl, f.get_sint32 ()); break; + case KW_password: assign (pl->password , f.get_str ()); break; + case KW_title: assign (pl->own_title, f.get_str ()); break; + case KW_shoottype: pl->shoottype = (rangetype) f.get_sint32 (); break; + case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; + case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; + case KW_listening: f.get (pl->listening); break; + case KW_peaceful: f.get (pl->peaceful); break; + case KW_digestion: f.get (pl->digestion); break; + case KW_pickup: f.get (pl->mode); break; + case KW_outputs_sync: f.get (pl->outputs_sync); break; + case KW_outputs_count: f.get (pl->outputs_count); break; + case KW_map: f.get (pl->maplevel); break; + case KW_savebed_map: f.get (pl->savebed_map); break; + case KW_bed_x: f.get (pl->bed_x); break; + case KW_bed_y: f.get (pl->bed_y); break; + case KW_weapon_sp: f.get (pl->weapon_sp); break; + case KW_Str: f.get (pl->orig_stats.Str); break; + case KW_Dex: f.get (pl->orig_stats.Dex); break; + case KW_Con: f.get (pl->orig_stats.Con); break; + case KW_Int: f.get (pl->orig_stats.Int); break; + case KW_Pow: f.get (pl->orig_stats.Pow); break; + case KW_Wis: f.get (pl->orig_stats.Wis); break; + case KW_Cha: f.get (pl->orig_stats.Cha); break; + case KW_gen_hp: f.get (pl->gen_hp); break; + case KW_gen_sp: f.get (pl->gen_sp); break; + case KW_gen_grace: f.get (pl->gen_grace); break; case KW_usekeys: - if (!strcmp (thawer.get_str (), "key_inventory")) + if (!strcmp (f.get_str (), "key_inventory")) pl->usekeys = key_inventory; - else if (!strcmp (thawer.get_str (), "keyrings")) + else if (!strcmp (f.get_str (), "keyrings")) pl->usekeys = keyrings; - else if (!strcmp (thawer.get_str (), "containers")) + else if (!strcmp (f.get_str (), "containers")) pl->usekeys = containers; else - LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", thawer.get_str ()); + LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", f.get_str ()); break; case KW_unapply: - if (!strcmp (thawer.get_str (), "unapply_nochoice")) + if (!strcmp (f.get_str (), "unapply_nochoice")) pl->unapply = unapply_nochoice; - else if (!strcmp (thawer.get_str (), "unapply_never")) + else if (!strcmp (f.get_str (), "unapply_never")) pl->unapply = unapply_never; - else if (!strcmp (thawer.get_str (), "unapply_always")) + else if (!strcmp (f.get_str (), "unapply_always")) pl->unapply = unapply_always; else - LOG (llevDebug, "load_player: got unknown unapply type: %s\n", thawer.get_str ()); + LOG (llevDebug, "load_player: got unknown unapply type: %s\n", f.get_str ()); break; case KW_lev_array: { - int count = thawer.get_sint32 (); + int count = f.get_sint32 (); for (int i = 1; i <= count; i++) { char line [32]; - fgets (line, 32, thawer); pl->levhp [i] = atoi (line); - fgets (line, 32, thawer); pl->levsp [i] = atoi (line); - fgets (line, 32, thawer); pl->levgrace[i] = atoi (line); + fgets (line, 32, f); pl->levhp [i] = atoi (line); + fgets (line, 32, f); pl->levsp [i] = atoi (line); + fgets (line, 32, f); pl->levgrace[i] = atoi (line); } } break; } - } -done: - if (!load_object (thawer, pl->ob, 0)) - { - pl->ob->destroy (); - pl->destroy (); - return 0; + f.next (); } - INVOKE_PLAYER (LOAD, pl); - - return pl; - failure: - LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", thawer.name); + LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name); pl->ob->destroy (); pl->destroy (); @@ -267,11 +264,13 @@ player * player::load_pl (const char *path) { - object_thawer thawer (path); + object_thawer f (path); - if (!thawer) + if (!f) return 0; - return load_pl (thawer); + f.next (); + + return load_pl (f); }