--- deliantra/server/include/region.h 2007/05/22 10:49:59 1.2 +++ deliantra/server/include/region.h 2007/07/01 05:00:18 1.6 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer game + * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify + * Crossfire TRT 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 + * 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 + * 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@schmorp.de + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ /* @@ -51,7 +50,7 @@ sint16 ACC (RW, jailx), ACC (RW, jaily);/* The coodinates in jailmap to which the player should be sent. */ shstr ACC (RW, portalmap); sint16 ACC (RW, portalx), ACC (RW, portaly); - int ACC (RW, index); + object_vector_index ACC (RW, index); uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ bool ACC (RW, fallback); /* whether, in the event of a region not existing, * this should be the one we fall back on as the default */ @@ -70,7 +69,7 @@ #define for_all_regions(var) \ for (unsigned _i = 0; _i < regions.size (); ++_i) \ - declvar (region *, var, regions [_i]) + statementvar (region *, var, regions [_i]) #endif