--- deliantra/server/common/loader.C 2009/11/16 22:31:13 1.149 +++ deliantra/server/common/loader.C 2011/05/01 16:58:15 1.169 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -23,7 +23,6 @@ */ #include -#include #include ///////////////////////////////////////////////////////////////////////////// @@ -268,6 +267,7 @@ switch (type) { + case RANGED: case BOW: case WAND: case ROD: @@ -335,6 +335,13 @@ if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) select_material (this, map ? map->difficulty : 5); + if (speed < 0.) + { + flag [FLAG_RANDOM_SPEED] = true; + speed = -speed; + // speed_left will be randomised in instantiate () and copy_to () + } + /* only do these when program is first run - a bit * excessive to do this at every run - most of this is * really just to catch any errors - program will still run, but @@ -390,7 +397,7 @@ #endif } - /* old style spellcasting object (pretty common) - need to load in the appropiate object */ + /* old style spellcasting object (pretty common) - need to load in the appropriate object */ /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ if ((type == ROD || type == WAND @@ -409,7 +416,7 @@ * in that spell was stored in sp. */ //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); - object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); + object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); insert_ob_in_ob (tmp, this); randomitems = 0; } @@ -425,7 +432,7 @@ value = arch->value * inv->value; } - if (QUERY_FLAG (this, FLAG_MONSTER)) + if (this->flag [FLAG_MONSTER]) { if (stats.hp > stats.maxhp) { @@ -438,7 +445,7 @@ move_type = MOVE_WALK; } - if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) + if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) /* Object will duplicate it's content as part of the * generation process. To do this, we must flag inventory * so it remains unevaluated concerning the randomitems and @@ -518,7 +525,7 @@ str++; } - for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) + for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) { if (!strcmp (f->name, str)) { @@ -545,7 +552,7 @@ object::parse_kv (object_thawer &f) { object *op_inv = inv; - key_value *last_kv = key_values; + key_value *last_kv = kv.first; for (;;) { @@ -584,8 +591,8 @@ // also, appending instead of prepending keeps the // save ordering the same between repeated load/saves. // and finally we do not want any funny effects - CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); - CLEAR_FLAG (tmp, FLAG_REMOVED); + tmp->clr_flag (FLAG_OBJ_ORIGINAL); + tmp->clr_flag (FLAG_REMOVED); if (!op_inv) { @@ -628,11 +635,11 @@ case KW_animation: { - CLEAR_FLAG (this, FLAG_ANIMATE); + this->clr_flag (FLAG_ANIMATE); animation_id = 0; if (f.has_value () && (animation_id = find_animation (f.get_str ()))) - SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here + this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here } break; @@ -640,6 +647,7 @@ case KW_last_sp: f.get (last_sp); break; case KW_last_grace: f.get (last_grace); break; case KW_last_eat: f.get (last_eat); break; + case KW_sl: case KW_speed_left: f.get (speed_left); break; case KW_speed: @@ -731,14 +739,7 @@ case KW_state: f.get (state); break; case KW_move_slow_penalty: f.get (move_slow_penalty); break; case KW_material: f.get (materials); break; //TODO: nuke - - case KW_materialname: - { - shstr sh; - f.get (sh); - material = name_to_material (sh); - } - break; + case KW_materialname: f.get (material); break; /* These are the new values */ case KW_move_block: set_move (move_block, f); break; @@ -819,8 +820,8 @@ case KW_identified: GET_FLAG (this, FLAG_IDENTIFIED); //TODO: move to check_object or so - if (QUERY_FLAG (this, FLAG_IDENTIFIED)) - CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); + if (this->flag [FLAG_IDENTIFIED]) + this->clr_flag (FLAG_KNOWN_MAGICAL); break; @@ -918,6 +919,8 @@ case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; + case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; + case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break; case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; @@ -1039,27 +1042,9 @@ return true; case KW_ERROR: - // append as key value pair (do not use kv_set as it prepends) - // we also do not even try to find old values, duplicate keys stay duplicate - { - key_value *kv = new key_value; - - kv->next = 0; - kv->key = shstr (f.kw_str); - kv->value = shstr (f.value); - - if (!last_kv) - key_values = last_kv = kv; - else - { - while (last_kv->next) - last_kv = last_kv->next; - - last_kv->next = kv; - last_kv = kv; - } - } - //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D + // we do not even try to find old values, duplicate keys stay duplicate + // the list gets reversed after loading + kv.add (shstr (f.kw_str), shstr (f.value)); break; default: @@ -1081,7 +1066,7 @@ if (!arch) { - LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); + LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ()); arch = archetype::find (shstr_earthwall); } @@ -1100,6 +1085,10 @@ return 0; } + // the loader reverses the ordering of kv-pairs, so we reverse it again after loading + // that greatly simplifies the loading code. + op->kv.reverse (); + op->post_load_check (); return op; } @@ -1113,7 +1102,7 @@ int set_variable (object *op, char *buf) { - object_thawer f (buf, (AV *)0); + object_thawer f (format ("%s\nend", buf), (AV *)0); return op->parse_kv (f); } @@ -1248,7 +1237,7 @@ KW_no_attack, KW_no_damage, KW_obj_original, - KW_NULL, + KW_random_speed, KW_activate_on_push, KW_activate_on_release, KW_is_water, @@ -1275,8 +1264,8 @@ /* This saves the key/value lists. We do it first so that any * keys that match field names will be overwritten by the loader. */ - for (key_value *kv = op->key_values; kv; kv = kv->next) - if (!arch->key_values || arch->kv (kv->key) != kv->value) + for (key_value *kv = op->kv.first; kv; kv = kv->next) + if (arch->kv.empty () || arch->kv [kv->key] != kv->value) f.put (kv->key, kv->value); if (op->uuid) @@ -1305,7 +1294,6 @@ CMP_OUT (name); CMP_OUT (name_pl); - CMP_OUT (speed); // speed_left is a major time-burner, and has good locality, so @@ -1313,14 +1301,14 @@ if (op->speed_left != arch->speed_left) { static double last_speed_left = 0.; - static char last_speed_left_str [256] = "speed_left 0\n"; - static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; + static char last_speed_left_str [256] = "sl 0\n"; + static int last_speed_left_len = sizeof ("sl 0\n") - 1; if (last_speed_left != op->speed_left) { last_speed_left = op->speed_left; - last_speed_left_len = sizeof ("speed_left ") - 1 - + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); + last_speed_left_len = sizeof ("sl ") - 1 + + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); } f.add (last_speed_left_str, last_speed_left_len); @@ -1335,7 +1323,8 @@ CMP_OUT (custom_name); if (object *owner = op->owner) - f.put (KW(owner), static_cast(owner->ref ())); + if (const char *ref = owner->ref ()) + f.put (KW(owner), ref); // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved @@ -1418,6 +1407,7 @@ f.put (KW(connected), ol->id); CMP_OUT (randomitems); + CMP_OUT2 (container, weight_limit); CMP_OUT (run_away); @@ -1444,6 +1434,7 @@ object::flags_t diff = (op->flag ^ arch->flag) & flagmask; +#if stdcpp // we need gcc, sorry if (diff [FLAG_OBJ_ORIGINAL]) f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); @@ -1454,11 +1445,16 @@ for (int i = 0; i < NUM_FLAGS; i++) if (expect_false (diff [i])) f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); +#else + // use sgi extensions + for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) + f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); +#endif // save body locations. gcc's memcmp does an abysmal job when used for (int i = 0; i < NUM_BODY_LOCATIONS; i++) if (expect_false (op->slot[i].info != arch->slot[i].info)) - f.put (body_locations[i].save_name, op->slot[i].info); + f.put (body_locations[i].kw, op->slot[i].info); } /* @@ -1500,6 +1496,8 @@ for (;;) { + coroapi::cede_to_tick (); + switch (f.kw) { case KW_region: