ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/face.h
(Generate patch)

Comparing deliantra/server/include/face.h (file contents):
Revision 1.24 by root, Thu Nov 8 19:43:24 2007 UTC vs.
Revision 1.26 by root, Tue Jul 29 02:00:55 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1994,2007 Mark Wedel 5 * Copyright (©) 1994,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
69object_freezer::put (keyword k, faceinfo *v) 69object_freezer::put (keyword k, faceinfo *v)
70{ 70{
71 put (k, v ? &v->name : (const char *)0); 71 put (k, v ? &v->name : (const char *)0);
72} 72}
73 73
74typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> facehash_t; 74typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t;
75 75
76extern facehash_t facehash; 76extern facehash_t facehash;
77extern std::vector<faceinfo> faces; 77extern std::vector<faceinfo> faces;
78 78
79/* This returns an the face number of face 'name'. Number is constant 79/* This returns an the face number of face 'name'. Number is constant
110 static animation &find (const char *name); 110 static animation &find (const char *name);
111 111
112 void resize (int new_size); 112 void resize (int new_size);
113}; 113};
114 114
115typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> >, true> animhash_t; 115typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t;
116 116
117extern animhash_t animhash; 117extern animhash_t animhash;
118extern std::vector<animation> animations; 118extern std::vector<animation> animations;
119 119
120#endif 120#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines