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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.274 by root, Sun Nov 18 15:19:48 2018 UTC vs.
Revision 1.275 by root, Sun Nov 18 16:32:27 2018 UTC

181 struct oblnk *link; 181 struct oblnk *link;
182 struct oblinkpt *next; 182 struct oblinkpt *next;
183 shstr id; /* Used as connected value in buttons/gates */ 183 shstr id; /* Used as connected value in buttons/gates */
184} oblinkpt; 184} oblinkpt;
185 185
186// temporary hack to find the culprit who corrupts face numbers. maybe. hopefully.
187struct faceidx_debug
188{
189 faceidx x;
190
191 operator faceidx () const
192 {
193 return x;
194 }
195
196 faceidx operator =(faceidx i)
197 {
198 if (ecb_expect_false (i >= faces.size ()))
199 {
200 fork_abort ("illegal faceidx assignment");
201 i = blank_face;
202 }
203
204 return x = i;
205 }
206};
207
208#if CFPERL
209static inline void sv_to (SV *sv, faceidx_debug &v) { v = SvIV (sv); }
210#endif
211
212INTERFACE_CLASS (object) 186INTERFACE_CLASS (object)
213// these are being copied 187// these are being copied
214struct object_copy : attachable 188struct object_copy : attachable
215{ 189{
216 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ 190 sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
279 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 253 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
280 uint8 ACC (RW, weapontype); /* type of weapon */ 254 uint8 ACC (RW, weapontype); /* type of weapon */
281 255
282 body_slot slot [NUM_BODY_LOCATIONS]; 256 body_slot slot [NUM_BODY_LOCATIONS];
283 257
284 faceidx_debug ACC (RW, face); /* the graphical face */ 258 faceidx ACC (RW, face); /* the graphical face */
285 259
286 faceidx ACC (RW, sound); /* the sound face */ 260 faceidx ACC (RW, sound); /* the sound face */
287 faceidx ACC (RW, sound_destroy); /* played on destroy */ 261 faceidx ACC (RW, sound_destroy); /* played on destroy */
288 262
289 sint32 ACC (RW, weight); /* Attributes of the object */ 263 sint32 ACC (RW, weight); /* Attributes of the object */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines