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

Comparing deliantra/server/common/image.C (file contents):
Revision 1.39 by root, Tue Jan 3 11:25:30 2012 UTC vs.
Revision 1.44 by root, Wed Nov 16 23:41:59 2016 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,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23#include <global.h> 23#include <global.h>
24#include <stdio.h> 24#include <stdio.h>
… …
29faceidx blank_face, empty_face, magicmouth_face; 29faceidx blank_face, empty_face, magicmouth_face;
30 30
31facehash_t facehash; 31facehash_t facehash;
32std::vector<faceinfo> faces; 32std::vector<faceinfo> faces;
33 33
34static std::vector<faceidx> faces_free; 34static std::vector<faceidx> faces_freelist;
35 35
36faceidx face_alloc () 36faceidx face_alloc ()
37{ 37{
38 faceidx idx; 38 faceidx idx;
39 39
40 if (faces_freelist.empty ()) 40 if (!faces_freelist.empty ())
41 { 41 {
42 idx = faces_free.back (); 42 idx = faces_freelist.back ();
43 faces_free.pop_back (); 43 faces_freelist.pop_back ();
44 } 44 }
45 else 45 else
46 { 46 {
47 idx = faces.size (); 47 idx = faces.size ();
48 48
… …
53 } 53 }
54 54
55 return idx; 55 return idx;
56} 56}
57 57
58void
58faceinfo::unref () 59faceinfo::unref ()
59{ 60{
60 if (--refcnt) 61 if (--refcnt)
61 return; 62 return;
62 63
… …
88} 89}
89 90
90facedata * 91facedata *
91faceinfo::data (int faceset) const 92faceinfo::data (int faceset) const
92{ 93{
93 if (!face [faceset].data.size ()) 94 if (!face [faceset].chksum_len)
94 faceset = 0; 95 faceset = 0;
95 96
96 return (facedata *)(face + faceset); 97 return (facedata *)(face + faceset);
97} 98}
98 99

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines