remove pointer to long conversions - part 1 of 3 rev 2 (trunk only)
[the problem in the earlier rev was tracked to cleanup_burn(), where arg was holding a (genericptr_t) timer id, and passed directly to del_light_source() as is.] P64 (Win64) has a 64 bit pointer size, but a 32 bit long size. Remove some code that forced pointers into a long int, and vice versa where information could be lost. This part deals with light source functions and their arguments mostly, and switches some arguments from type genericptr_t to 'anything'.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* SCCS Id: @(#)mkobj.c 3.5 2006/07/07 */
|
||||
/* SCCS Id: @(#)mkobj.c 3.5 2006/07/08 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
|
||||
@@ -1760,7 +1760,7 @@ dealloc_obj(obj)
|
||||
* attached to it (and also requires lamplit to be set).
|
||||
*/
|
||||
if (obj_sheds_light(obj))
|
||||
del_light_source(LS_OBJECT, (genericptr_t) obj);
|
||||
del_light_source(LS_OBJECT, obj_to_any(obj));
|
||||
|
||||
if (obj == thrownobj) thrownobj = (struct obj*)0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user