--- deliantra/server/common/object.C 2009/11/06 13:31:47 1.296 +++ deliantra/server/common/object.C 2010/03/26 00:59:20 1.314 @@ -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 (©) 2001,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2001 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 @@ -28,7 +28,6 @@ #include #include #include -#include #include @@ -79,7 +78,7 @@ } static void -read_uuid (void) +read_uuid () { char filename[MAX_BUF]; @@ -103,7 +102,7 @@ _exit (1); } - UUID::BUF buf; + char buf [UUID::MAX_LEN]; buf[0] = 0; fgets (buf, sizeof (buf), fp); @@ -142,6 +141,71 @@ read_uuid (); } +bool +UUID::parse (const char *s) +{ + if (*s++ != '<' || *s++ != '1' || *s++ != '.') + return false; + + seq = 0; + + while (*s != '>') + { + if (*s < '0') + return false; + + // this gives nice branchless code with gcc + assert ('0' < 'a' && '0' == 48 && 'a' == 97); + int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15; + + seq = (seq << 4) | digit; + + ++s; + } + + return true; +} + +char * +UUID::append (char *buf) const +{ + *buf++ = '<'; + *buf++ = '1'; + *buf++ = '.'; + + uint64_t seq = this->seq; + const int bits = 64; + char nz = 0; + static const char tohex [] = "0123456789abcdef"; + + // assert (len >= 3 + bits / 4 + 1 + 1); + for (int i = bits / 4; --i; ) + { + uint8_t digit = seq >> (bits - 4); + + *buf = tohex [digit]; + nz |= digit; + buf += nz ? 1 : 0; + seq <<= 4; + } + + // last digit is special - always emit + uint8_t digit = seq >> (bits - 4); + *buf++ = tohex [digit]; + + *buf++ = '>'; + + return buf; +} + +char * +UUID::c_str () const +{ + static char buf [MAX_LEN]; + *append (buf) = 0; + return buf; +} + /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ static bool compare_ob_value_lists_one (const object *wants, const object *has) @@ -185,12 +249,12 @@ */ bool object::can_merge_slow (object *ob1, object *ob2) { - /* A couple quicksanity checks */ + /* A couple quick sanity checks */ if (ob1 == ob2 || ob1->type != ob2->type - || ob1->speed != ob2->speed || ob1->value != ob2->value - || ob1->name != ob2->name) + || ob1->name != ob2->name + || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) return 0; /* Do not merge objects if nrof would overflow, assume nrof @@ -221,9 +285,9 @@ || ob1->skill != ob2->skill || ob1->value != ob2->value || ob1->animation_id != ob2->animation_id - || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other + || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other || ob1->client_type != ob2->client_type - || ob1->materialname != ob2->materialname + || ob1->material != ob2->material || ob1->lore != ob2->lore || ob1->subtype != ob2->subtype || ob1->move_type != ob2->move_type @@ -232,7 +296,7 @@ || ob1->move_on != ob2->move_on || ob1->move_off != ob2->move_off || ob1->move_slow != ob2->move_slow - || ob1->move_slow_penalty != ob2->move_slow_penalty + || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) return 0; @@ -458,6 +522,21 @@ } /* + * Returns the object which has the uuid equal to the argument. + * MOAR VERRRY slow. + */ + +object * +find_object_uuid (UUID i) +{ + for_all_objects (op) + if (op->uuid == i) + return op; + + return 0; +} + +/* * Returns the first object which has a name equal to the argument. * Used only by the patch command, but not all that useful. * Enables features like "patch food 999" @@ -624,9 +703,6 @@ } } - if (speed < 0) - dst->speed_left -= rndm (); - dst->activate (); } @@ -636,7 +712,12 @@ if (!uuid.seq) // HACK uuid = UUID::gen (); - speed_left = -0.1f; + // TODO: unclean state changes, should nt be done in copy_to AND instantiate + if (flag [FLAG_RANDOM_SPEED] && speed) + speed_left = - speed - rndm (); // TODO animation + else + speed_left = -1.; + /* copy the body_info to the body_used - this is only really * need for monsters, but doesn't hurt to do it for everything. * by doing so, when a monster is created, it has good starting @@ -654,6 +735,11 @@ { object *neu = create (); copy_to (neu); + + // TODO: unclean state changes, should not be done in clone AND instantiate + if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) + neu->speed_left = - neu->speed - rndm (); // TODO animation + neu->map = map; // not copied by copy_to return neu; } @@ -681,12 +767,6 @@ void object::set_speed (float speed) { - if (flag [FLAG_FREED] && speed) - { - LOG (llevError, "Object %s is freed but has speed.\n", &name); - speed = 0; - } - this->speed = speed; if (has_active_speed ()) @@ -746,6 +826,7 @@ /* nop */; else if (action == UP_OBJ_INSERT) { +#if 0 // this is likely overkill, TODO: revisit (schmorp) if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) @@ -760,8 +841,11 @@ * have move_allow right now. */ || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block - || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) m.invalidate (); +#else + // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) + m.invalidate (); +#endif } /* if the object is being removed, we can't make intelligent * decisions, because remove_ob can't really pass the object @@ -783,7 +867,8 @@ SET_FLAG (this, FLAG_REMOVED); //expmul = 1.0; declared const for the time being - face = blank_face; + face = blank_face; + material = MATERIAL_NULL; } object::~object () @@ -1064,18 +1149,13 @@ below = 0; env = 0; - /* NO_FIX_PLAYER is set when a great many changes are being - * made to players inventory. If set, avoiding the call - * to save cpu time. - */ - if (pl) - if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) - { - pl->update_stats (); + if (pl && pl->is_player ()) + { + pl->contr->queue_stats_update (); - if (glow_radius && pl->is_on_map ()) - update_all_los (pl->map, pl->x, pl->y); - } + if (glow_radius && pl->is_on_map ()) + update_all_los (pl->map, pl->x, pl->y); + } } else if (map) { @@ -1205,7 +1285,7 @@ for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) { - object *op = arch_to_object (at); + object *op = at->instance (); op->name = name; op->name_pl = name_pl; @@ -1253,7 +1333,7 @@ * * Return value: * new object if 'op' was merged with other object - * NULL if 'op' was destroyed + * NULL if there was an error (destroyed, blocked etc.) * just 'op' otherwise */ object * @@ -1490,7 +1570,7 @@ if (tmp->arch->archname == archname) /* same archetype */ tmp->destroy (); - object *tmp = arch_to_object (archetype::find (archname)); + object *tmp = archetype::find (archname)->instance (); tmp->x = op->x; tmp->y = op->y; @@ -1507,6 +1587,28 @@ return where->map->insert (this, where->x, where->y, originator, flags); } +// check whether we can put this into the map, respect max_volume, max_items +bool +object::can_drop_at (maptile *m, int x, int y, object *originator) +{ + mapspace &ms = m->at (x, y); + + int items = ms.items (); + + if (!items // testing !items ensures we can drop at least one item + || (items < m->max_items + && ms.volume () < m->max_volume)) + return true; + + if (originator && originator->is_player ()) + originator->contr->failmsg (format ( + "No matter how hard you try, you just cannot put the %s here H", + query_name () + )); + + return false; +} + /* * decrease(object, number) decreases a specified number from * the amount of an object. If the amount reaches 0, the object @@ -1654,9 +1756,9 @@ update_stats (); update_all_los (map, x, y); } - else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) + else if (is_player ()) // if this is a player's inventory, update stats - update_stats (); + contr->queue_stats_update (); INVOKE_OBJECT (INSERT, this); @@ -2434,15 +2536,6 @@ : region::default_region (); } -const materialtype_t * -object::dominant_material () const -{ - if (materialtype_t *mt = name_to_material (materialname)) - return mt; - - return name_to_material (shstr_unknown); -} - void object::open_container (object *new_container) { @@ -2486,7 +2579,7 @@ // insert the "Close Container" object. if (archetype *closer = new_container->other_arch) { - object *closer = arch_to_object (new_container->other_arch); + object *closer = new_container->other_arch->instance (); closer->flag [FLAG_NO_MAP_SAVE] = 1; new_container->insert (closer); } @@ -2602,3 +2695,19 @@ } } +void object::change_move_type (MoveType mt) +{ + if (move_type == mt) + return; + + if (is_on_map ()) + { + // we are on the map, so handle move_on/off effects + remove (); + move_type = mt; + map->insert (this, x, y, this); + } + else + move_type = mt; +} +