ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/material.C
(Generate patch)

Comparing deliantra/server/common/material.C (file contents):
Revision 1.7 by root, Tue Nov 10 16:29:20 2009 UTC vs.
Revision 1.11 by root, Thu Apr 15 03:34:30 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
190} 190}
191 191
192//-GPL 192//-GPL
193 193
194void 194void
195load_materials (void) 195load_materials ()
196{ 196{
197 char filename[MAX_BUF]; 197 char filename[MAX_BUF];
198 198
199 sprintf (filename, "%s/materials", settings.datadir); 199 sprintf (filename, "%s/materials", settings.datadir);
200 LOG (llevDebug, "Reading material type data from %s...\n", filename); 200 LOG (llevDebug, "Reading material type data from %s...\n", filename);
201 201
202 //TODO: somehow free old materials, or update them in-place 202 //TODO: somehow free old materials, or update them in-place
203 // currently we effectively leak them.
203 material_null.next = 0; materialt = &material_null; 204 material_null.next = 0; materialt = &material_null;
204 205
205 object_thawer thawer (filename); 206 object_thawer thawer (filename);
206 207
207 if (!thawer) 208 if (!thawer)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines