ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.111 by root, Mon Jan 8 01:19:02 2007 UTC vs.
Revision 1.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28#include <global.h> 28#include <global.h>
395 * Returns the object which has the count-variable equal to the argument. 395 * Returns the object which has the count-variable equal to the argument.
396 */ 396 */
397object * 397object *
398find_object (tag_t i) 398find_object (tag_t i)
399{ 399{
400 return ((unsigned int)i) < objects.size () 400 for_all_objects (op)
401 ? objects [i] 401 if (op->count == i)
402 : 0; 402 return op;
403
404 return 0;
403} 405}
404 406
405/* 407/*
406 * Returns the first object which has a name equal to the argument. 408 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 409 * Used only by the patch command, but not all that useful.
658 660
659 if (op->more) 661 if (op->more)
660 update_object (op->more, action); 662 update_object (op->more, action);
661} 663}
662 664
663object *object::first;
664
665object::object () 665object::object ()
666{ 666{
667 SET_FLAG (this, FLAG_REMOVED); 667 SET_FLAG (this, FLAG_REMOVED);
668 668
669 expmul = 1.0; 669 expmul = 1.0;
673object::~object () 673object::~object ()
674{ 674{
675 free_key_values (this); 675 free_key_values (this);
676} 676}
677 677
678static int object_count;
679
678void object::link () 680void object::link ()
679{ 681{
680 assert (!count);//D 682 assert (!index);//D
681 uuid = gen_uuid (); 683 uuid = gen_uuid ();
684 count = ++object_count;
682 685
683 refcnt_inc (); 686 refcnt_inc ();
684 objects.insert (this); 687 objects.insert (this);
685} 688}
686 689
687void object::unlink () 690void object::unlink ()
688{ 691{
689 assert (count);//D 692 assert (index);//D
690 objects.erase (this); 693 objects.erase (this);
691 refcnt_dec (); 694 refcnt_dec ();
692} 695}
693 696
694void 697void
805} 808}
806 809
807void 810void
808object::do_destroy () 811object::do_destroy ()
809{ 812{
813 attachable::do_destroy ();
814
810 if (flag [FLAG_IS_LINKED]) 815 if (flag [FLAG_IS_LINKED])
811 remove_button_link (this); 816 remove_button_link (this);
812 817
813 if (flag [FLAG_FRIENDLY]) 818 if (flag [FLAG_FRIENDLY])
814 remove_friendly_object (this); 819 remove_friendly_object (this);
815 820
816 if (!flag [FLAG_REMOVED]) 821 if (!flag [FLAG_REMOVED])
817 remove (); 822 remove ();
818 823
819 if (flag [FLAG_FREED]) 824 destroy_inv (true);
820 return;
821 825
822 set_speed (0); 826 deactivate ();
827 unlink ();
823 828
824 flag [FLAG_FREED] = 1; 829 flag [FLAG_FREED] = 1;
825
826 attachable::do_destroy ();
827
828 destroy_inv (true);
829 unlink ();
830 830
831 // hack to ensure that freed objects still have a valid map 831 // hack to ensure that freed objects still have a valid map
832 { 832 {
833 static maptile *freed_map; // freed objects are moved here to avoid crashes 833 static maptile *freed_map; // freed objects are moved here to avoid crashes
834 834
2163 2163
2164 return 3; 2164 return 3;
2165} 2165}
2166 2166
2167/* 2167/*
2168 * absdir(int): Returns a number between 1 and 8, which represent
2169 * the "absolute" direction of a number (it actually takes care of
2170 * "overflow" in previous calculations of a direction).
2171 */
2172
2173int
2174absdir (int d)
2175{
2176 while (d < 1)
2177 d += 8;
2178
2179 while (d > 8)
2180 d -= 8;
2181
2182 return d;
2183}
2184
2185/*
2186 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2168 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2187 * between two directions (which are expected to be absolute (see absdir()) 2169 * between two directions (which are expected to be absolute (see absdir())
2188 */ 2170 */
2189
2190int 2171int
2191dirdiff (int dir1, int dir2) 2172dirdiff (int dir1, int dir2)
2192{ 2173{
2193 int d; 2174 int d;
2194 2175
2633{ 2614{
2634 static char info[256 * 4]; 2615 static char info[256 * 4];
2635 return debug_desc (info); 2616 return debug_desc (info);
2636} 2617}
2637 2618
2619const char *
2620object::debug_desc2 () const
2621{
2622 static char info[256 * 4];
2623 return debug_desc (info);
2624}
2625

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines