--- deliantra/server/include/define.h 2008/12/28 06:59:26 1.96 +++ deliantra/server/include/define.h 2009/10/12 14:00:58 1.102 @@ -5,18 +5,19 @@ * Copyright (©) 2003-2005,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. + * 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 GNU General Public License - * along with this program. If not, see . + * 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 */ @@ -207,7 +208,7 @@ on chairs, we create a new type and remove all chairs from here. */ //80 -//81 +#define TORCH 81 /* a torch */ #define LAMP 82 /* a lamp */ #define DUPLICATOR 83 /* duplicator/multiplier object */ //84 @@ -290,7 +291,7 @@ #define MATERIAL 161 /* Material for building */ //162 #define ITEM_TRANSFORMER 163 /* Transforming one item with another */ -//164 +#define MAPSCRIPT 164 /* A perl-scripted connectable */ #define SAFE_GROUND 165 /* This is a safe ground, means that neither bombs, potions, alchemy, or magic works here (elmex) */ @@ -345,7 +346,7 @@ #define PU_DEBUG 0x10000000 #define PU_INHIBIT 0x20000000 #define PU_STOP 0x40000000 -#define PU_NEWMODE 0x80000000 +#define PU_ENABLE 0x80000000 // used to distinguish value density #define PU_RATIO 0x0000000F @@ -860,7 +861,7 @@ /** * Maximum distance a player may hear a sound from. - * This is only used for new client/server sound. If the sound source + * This is only used for client/server sound and say. If the sound source * on the map is farther away than this, we don't sent it to the client. */ #define MAX_SOUND_DISTANCE 16