--- deliantra/server/common/friend.C 2006/09/10 16:00:23 1.5
+++ deliantra/server/common/friend.C 2007/11/08 19:43:23 1.17
@@ -1,42 +1,37 @@
-
/*
- * static char *rcsid_friend_c =
- * "$Id: friend.C,v 1.5 2006/09/10 16:00:23 root Exp $";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * Deliantra is free software: you can redistribute it and/or modify
+ * it under the terms of the 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 GNU General Public License
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
*/
-/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- Copyright (C) 1992 Frank Tore Johansen
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 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 GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- The authors can be reached via e-mail at crossfire-devel@real-time.com
-*/
-
#include
/*
* Add a new friendly object to the linked list of friendly objects.
* No checking to see if the object is already in the linked list is done.
*/
-
void
add_friendly_object (object *op)
{
+ op->flag [FLAG_FRIENDLY] = 1;
+
objectlink *ol;
/* Add some error checking. This shouldn't happen, but the friendly
@@ -44,11 +39,11 @@
* won't remove it either. Plus, it is easier to put a breakpoint in
* the debugger here and see where the problem is happening.
*/
- for (ol = first_friendly_object; ol != NULL; ol = ol->next)
+ for (ol = first_friendly_object; ol; ol = ol->next)
{
if (ol->ob == op)
{
- LOG (llevError, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name);
+ LOG (llevError | logBacktrace, "add_friendly_object: Trying to add object already on list (%s)\n", &op->name);
return;
}
}
@@ -56,14 +51,12 @@
ol = first_friendly_object;
first_friendly_object = get_objectlink ();
first_friendly_object->ob = op;
- first_friendly_object->id = op->count;
first_friendly_object->next = ol;
}
/*
* Removes the specified object from the linked list of friendly objects.
*/
-
void
remove_friendly_object (object *op)
{
@@ -71,11 +64,18 @@
CLEAR_FLAG (op, FLAG_FRIENDLY);
+ if (op->type == GOLEM
+ && op->owner
+ && op->owner->contr
+ && op->owner->contr->golem == op)
+ op->owner->contr->golem = 0;
+
if (!first_friendly_object)
{
LOG (llevError, "remove_friendly_object called with empty friendly list, remove ob=%s\n", &op->name);
return;
}
+
/* if the first object happens to be the one, processing is pretty
* easy.
*/
@@ -83,44 +83,37 @@
{
obj = first_friendly_object;
first_friendly_object = obj->next;
- free (obj);
+ delete obj;
}
else
{
objectlink *prev = first_friendly_object;
- for (obj = first_friendly_object->next; obj != NULL; obj = obj->next)
+ for (obj = first_friendly_object->next; obj; obj = obj->next)
{
if (obj->ob == op)
break;
+
prev = obj;
}
+
if (obj)
{
- /* This should not happen. But if it does, presumably the
- * call to remove it is still valid.
- */
- if (obj->id != op->count)
- {
- LOG (llevError, "remove_friendly_object, tags do no match, %s, %d != %d\n",
- op->name ? (const char *) op->name : "none", op->count, obj->id);
- }
prev->next = obj->next;
- free (obj);
+ delete obj;
}
}
}
/*
- * Dumps all friendly objects. Invoked in DM-mode with the G key.
+ * Dumps all friendly objects.
*/
-
void
dump_friendly_objects (void)
{
objectlink *ol;
- for (ol = first_friendly_object; ol != NULL; ol = ol->next)
+ for (ol = first_friendly_object; ol; ol = ol->next)
LOG (llevError, "%s (%d)\n", &ol->ob->name, ol->ob->count);
}
@@ -134,26 +127,24 @@
objectlink *obj, *prev = NULL, *next;
int count = 0;
- for (obj = first_friendly_object; obj != NULL; obj = next)
+ for (obj = first_friendly_object; obj; obj = next)
{
next = obj->next;
- if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY) || (obj->id != obj->ob->count))
+ if (QUERY_FLAG (obj->ob, FLAG_FREED) || !QUERY_FLAG (obj->ob, FLAG_FRIENDLY))
{
if (prev)
- {
- prev->next = obj->next;
- }
+ prev->next = obj->next;
else
- {
- first_friendly_object = obj->next;
- }
+ first_friendly_object = obj->next;
+
count++;
- free (obj);
+ delete obj;
}
- /* If we removed the object, then prev is still valid. */
else
+ /* If we removed the object, then prev is still valid. */
prev = obj;
}
+
if (count)
LOG (llevDebug, "clean_friendly_list: Removed %d bogus links\n", count);
}
@@ -166,9 +157,10 @@
{
objectlink *ol;
- for (ol = first_friendly_object; ol != NULL; ol = ol->next)
+ for (ol = first_friendly_object; ol; ol = ol->next)
if (ol->ob == op)
return 1;
return 0;
}
+