--- deliantra/server/include/define.h 2011/05/04 19:39:43 1.136 +++ deliantra/server/include/define.h 2012/10/29 23:55:53 1.141 @@ -1,24 +1,24 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2003-2005 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 */ @@ -285,6 +285,7 @@ #define ST_MAT_FLOOR 1 /* Floor */ #define ST_MAT_WALL 2 /* Wall */ #define ST_MAT_ITEM 3 /* All other items, including doors & such */ +#define ST_MAT_QUAD 4 /* Quad build material */ /* definitions for weapontypes */ @@ -384,7 +385,7 @@ #define FLAG_UNPAID 6 /* Object hasn't been paid for yet */ #define FLAG_USE_SHIELD 7 /* Can this creature use a shield? */ #define FLAG_NO_PICK 8 /* Object can't be picked up */ -/*#define FLAG_WALK_ON 9*/ +#define FLAG_IS_TRANSPARENT_FLOOR 9 // floor shows things on lower z-level(s), CF: walk_on /*#define FLAG_NO_PASS 10*//* Nothing can pass (wall() is true) */ #define FLAG_ANIMATE 11 /* The object looks at archetype for faces */ /*#define FLAG_SLOW_MOVE 12*//* Uses the stats.exp/1000 to slow down */ @@ -501,7 +502,7 @@ */ // temporary assignments -#define FLAG_PHYSICS_QUEUE 114 // object queued for physics +#define FLAG_PHYSICS_QUEUE 114 // object queued for physics TODO: temporary allocation #define NUM_FLAGS 115 /* Should always be equal to the last * defined flag + 1. @@ -536,7 +537,7 @@ * on the 'type' move_block parameter * Add check - if type is 0, don't stop anything from moving * onto it. - * + * */ #define OB_TYPE_MOVE_BLOCK(ob1, type) \ ((type) && (ob1->move_type & type) == ob1->move_type)