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

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.42 by root, Tue Nov 10 04:38:45 2009 UTC vs.
Revision 1.46 by root, Sat Apr 23 04:56:46 2011 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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.
58 58
59 return v; 59 return v;
60} 60}
61 61
62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" }; 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
63
64bool
65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
63 72
64const char * 73const char *
65shstr::find (const char *s) 74shstr::find (const char *s)
66{ 75{
67 if (!s) 76 if (!s)
141#define def(id) def2(shstr_ ## id, # id) 150#define def(id) def2(shstr_ ## id, # id)
142# include "shstrinc.h" 151# include "shstrinc.h"
143#undef def 152#undef def
144#undef def2 153#undef def2
145 154
146shstr skill_names[NUM_SKILLS];
147materialtype_t material_null; 155materialtype_t material_null;
148 156

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines