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

Comparing deliantra/server/include/shstr.h (file contents):
Revision 1.16 by root, Mon May 28 21:15:56 2007 UTC vs.
Revision 1.23 by root, Sun Dec 28 06:59:27 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Crossfire TRT is free software; you can redistribute it and/or modify it 6 * Deliantra is free software: you can redistribute it and/or modify
7 * under the terms of the GNU General Public License as published by the Free 7 * it under the terms of the GNU General Public License as published by
8 * Software Foundation; either version 2 of the License, or (at your option) 8 * the Free Software Foundation, either version 3 of the License, or
9 * any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
12 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License along 16 * You should have received a copy of the GNU General Public License
17 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 * 18 *
20 * The authors can be reached via e-mail to <crossfire@schmorp.de> 19 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 20 */
22 21
23#ifndef SHSTR_H__ 22#ifndef SHSTR_H__
24#define SHSTR_H__ 23#define SHSTR_H__
25 24
26#include <sstream> 25#include <sstream>
27 26
28#include "util.h" 27#include "util.h"
28
29extern size_t shstr_alloc;
29 30
30extern int buf_overflow (const char *buf1, const char *buf2, int bufsize); 31extern int buf_overflow (const char *buf1, const char *buf2, int bufsize);
31 32
32struct shstr 33struct shstr
33{ 34{
… …
115 s = intern (str); 116 s = intern (str);
116 117
117 return *this; 118 return *this;
118 } 119 }
119 120
120 bool operator ==(const shstr &b)
121 {
122 return s == b.s;
123 }
124
125 bool operator !=(const shstr &b) 121 bool operator !=(const shstr &b)
126 { 122 {
127 return !(*this == b); 123 return !(*this == b);
128 } 124 }
129}; 125};
126
127inline bool operator ==(const shstr &a, const shstr &b)
128{
129 return a.s == b.s;
130}
130 131
131inline int strlen (const shstr &sh) 132inline int strlen (const shstr &sh)
132{ 133{
133 return sh.length (); 134 return sh.length ();
134} 135}
… …
164 shstr_cmp (const shstr_cmp &sh) 165 shstr_cmp (const shstr_cmp &sh)
165 : s (sh.s) 166 : s (sh.s)
166 { 167 {
167 } 168 }
168 169
170 shstr_cmp (const shstr &sh)
171 : s (sh.s)
172 {
173 }
174
175 // this is used for informational messages and the like
176 const char *operator &() const { return s; }
177
169 shstr_cmp &operator =(const shstr_cmp sh) { s = sh.s; return *this; } 178 shstr_cmp &operator =(const shstr_cmp sh) { s = sh.s; return *this; }
170 operator const char *() const { return s; } 179 operator const char *() const { return s; }
171}; 180};
172 181
173inline bool operator ==(const shstr_cmp &a, const shstr &b) 182inline bool operator ==(const shstr_cmp &a, const shstr &b)
… …
178inline bool operator ==(const shstr &a, const shstr_cmp &b) 187inline bool operator ==(const shstr &a, const shstr_cmp &b)
179{ 188{
180 return b == a; 189 return b == a;
181} 190}
182 191
183extern const shstr undead_name; /* Used in hit_player() in main.c */ 192extern const shstr shstr_null;
193
194#define def(str) extern const shstr shstr_ ## str;
195# include "shstrinc.h"
196#undef def
184 197
185#endif 198#endif
186 199

Diff Legend

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