--- deliantra/server/include/treasure.h 2008/05/06 16:55:26 1.24 +++ deliantra/server/include/treasure.h 2009/11/11 23:27:57 1.26 @@ -5,18 +5,19 @@ * Copyright (©) 2002,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 */ @@ -118,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);