--- deliantra/server/include/treasure.h 2009/10/12 14:00:58 1.25 +++ deliantra/server/include/treasure.h 2011/04/23 04:56:51 1.30 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 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 @@ -46,7 +46,7 @@ */ enum { - GT_ENVIRONMENT = 0x0001, // put treasure at objetc, not into object + GT_ENVIRONMENT = 0x0001, // put treasure at object, not into object GT_INVISIBLE = 0x0002, GT_STARTEQUIP = 0x0004, GT_APPLY = 0x0008, @@ -119,9 +119,12 @@ }; inline void -object_freezer::put (keyword k, treasurelist *v) +object_freezer::put (const keyword_string k, treasurelist *v) { - put (k, v ? &v->name : (const char *)0); + if (expect_true (v)) + put (k, v->name); + else + put (k); } void create_treasure (treasurelist *t, object *op, int flag, int difficulty, int tries = 0);