--- deliantra/server/common/loader.C 2010/04/29 12:24:03 1.157
+++ deliantra/server/common/loader.C 2016/11/16 23:41:59 1.177
@@ -1,24 +1,24 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -267,6 +267,7 @@
switch (type)
{
+ case RANGED:
case BOW:
case WAND:
case ROD:
@@ -415,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;
}
@@ -476,8 +477,6 @@
// if the object has an animation, try to provide a default face
if (has_anim ())
{
- const animation &anim_ob = anim ();
-
if (anim_speed)
// if this item is time-animated, force the last frame
animate_object (this, 0);
@@ -524,7 +523,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))
{
@@ -551,7 +550,6 @@
object::parse_kv (object_thawer &f)
{
object *op_inv = inv;
- key_value *last_kv = key_values;
for (;;)
{
@@ -634,11 +632,11 @@
case KW_animation:
{
- this->clr_flag (FLAG_ANIMATE);
+ clr_flag (FLAG_ANIMATE);
animation_id = 0;
- if (f.has_value () && (animation_id = find_animation (f.get_str ())))
- this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
+ if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
+ set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
}
break;
@@ -748,74 +746,11 @@
case KW_move_off: set_move (move_off , f); break;
case KW_move_slow: set_move (move_slow , f); break;
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_no_pass:
- {
- if (f.get_sint32 ())
- move_block = MOVE_ALL;
- else
- move_block = 0;
- }
-
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_walk_on:
- {
- if (f.get_sint32 ())
- move_on |= MOVE_WALK;
- else
- move_on &= ~MOVE_WALK;
- }
-
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_walk_off:
- {
- if (f.get_sint32 ())
- move_off |= MOVE_WALK;
- else
- move_off &= ~MOVE_WALK;
- }
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_fly_on:
- {
- if (f.get_sint32 ())
- move_on |= MOVE_FLY_LOW;
- else
- move_on &= ~MOVE_FLY_LOW;
- }
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_fly_off:
- {
- if (f.get_sint32 ())
- move_off |= MOVE_FLY_LOW;
- else
- move_off &= ~MOVE_FLY_LOW;
- }
- break;
-
//TODO: remove these after converting archetypes
case KW_can_use_wand:
GET_FLAG (this, FLAG_USE_RANGE);
break;
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_flying:
- {
- if (f.get_sint32 ())
- move_type |= MOVE_FLY_LOW;
- else
- move_type &= ~MOVE_FLY_LOW;
- }
- break;
-
-
case KW_identified:
GET_FLAG (this, FLAG_IDENTIFIED);
//TODO: move to check_object or so
@@ -857,6 +792,7 @@
case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
+ case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
@@ -919,6 +855,7 @@
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;
@@ -1040,27 +977,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:
@@ -1082,7 +1001,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);
}
@@ -1101,6 +1020,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;
}
@@ -1114,7 +1037,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);
}
@@ -1144,7 +1067,7 @@
KW_unpaid,
KW_can_use_shield,
KW_no_pick,
- KW_NULL, // walk_on
+ KW_is_transparent_floor,
/* 10 */
KW_NULL, // no_pass
KW_is_animated,
@@ -1276,8 +1199,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)
@@ -1466,7 +1389,7 @@
// 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);
}
/*
@@ -1508,6 +1431,8 @@
for (;;)
{
+ coroapi::cede_to_tick ();
+
switch (f.kw)
{
case KW_region: