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

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.27 by root, Sun Sep 17 18:19:19 2006 UTC vs.
Revision 1.31 by root, Tue Nov 7 16:30:55 2006 UTC

… …
51#define ARG_AV(o) DT_AV , static_cast<AV *> (o) 51#define ARG_AV(o) DT_AV , static_cast<AV *> (o)
52#define ARG_INT(v) DT_INT , static_cast<int> (v) 52#define ARG_INT(v) DT_INT , static_cast<int> (v)
53#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v) 53#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v)
54#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v) 54#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
55#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v) 55#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
56#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), (l) 56#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), int (l)
57#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<object *> (o) 57#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<object *> (o)
58#define ARG_MAP(o) DT_MAP , (void *)static_cast<maptile *> (o) 58#define ARG_MAP(o) DT_MAP , (void *)static_cast<maptile *> (o)
59#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<player *> (o) 59#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<player *> (o)
60#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<archetype *> (o) 60#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<archetype *> (o)
61#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<party *> (o) 61#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<party *> (o)
62#define ARG_REGION(o) DT_REGION, (void *)static_cast<region *> (o) 62#define ARG_REGION(o) DT_REGION, (void *)static_cast<region *> (o)
63 63
64// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension 64// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
… …
147 void put (attachable<subclass> *obj) 147 void put (attachable<subclass> *obj)
148 { 148 {
149 put ((attachable_base *)obj); 149 put ((attachable_base *)obj);
150 } 150 }
151 151
152 //TODO//temporary 152 // used only for user-defined key-value pairs
153 void put (const char *k, const char *v) 153 void put (const shstr &k, const shstr &v)
154 { 154 {
155 add (k); 155 add (k);
156 156
157 if (v) 157 if (v)
158 add (' '), add (v); 158 add (' '), add (v);
159 159
160 add ('\n'); 160 add ('\n');
161 } 161 }
162 162
163 //TODO//temporary 163 //TODO//temporary, used only for saving body locations
164 void put (const char *k, int v) 164 void put (const char *k, int v)
165 { 165 {
166 add (k); 166 add (k);
167 add (' '); 167 add (' ');
168 add (sint32 (v)); 168 add (sint32 (v));
169 add ('\n'); 169 add ('\n');
170 } 170 }
171 171
172#if 1 172 template<typename T>
173 void put (keyword k, const char *v) 173 void put_string (keyword k, const T &v)
174 { 174 {
175 int klen = keyword_len [k]; 175 int klen = keyword_len [k];
176 int vlen = v ? strlen (v) + 1 : 0; 176 int vlen = v ? strlen (v) + 1 : 0;
177 177
178 char *p = (char *)alloc (klen + vlen + 1); 178 char *p = (char *)alloc (klen + vlen + 1);
179 179
180 memcpy (p, keyword_str [k], klen); p += klen; 180 memcpy (p, keyword_str [k], klen); p += klen;
181 181
182 if (v) 182 if (v)
183 { 183 {
184 *p++ = ' '; vlen--; //TODO//cf compatibility always add space 184 *p++ = ' '; vlen--;
185 memcpy (p, v, vlen); p += vlen; 185 memcpy (p, v, vlen); p += vlen;
186 } 186 }
187 187
188 *p = '\n'; 188 *p = '\n';
189 } 189 }
190#endif
191 190
192#if 0 191 void put (keyword k, const char *v)
192 {
193 put_string (k, v);
194 }
195
193 void put (keyword k, const shstr &v) 196 void put (keyword k, const shstr &v)
194 { 197 {
195 int klen = keyword_len [k]; 198 put_string (k, v);
196 int vlen = v ? v.length () + 1 : 0;
197
198 char *p = (char *)alloc (klen + vlen + 1);
199
200 memcpy (p, keyword_str [k], klen); p += klen;
201
202 if (v)
203 {
204 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
205 memcpy (p, v, vlen); p += vlen;
206 }
207
208 *p = '\n';
209 } 199 }
210#endif
211 200
212 void put (keyword k, double v) 201 void put (keyword k, double v)
213 { 202 {
214 char buf [128]; 203 char buf [128];
215 204
… …
267 else 256 else
268 put (k, (const char *)0); 257 put (k, (const char *)0);
269 } 258 }
270 259
271 bool save (const char *filename); 260 bool save (const char *filename);
261 char *as_string (); // like strdup
272 262
273 operator bool () { return !!av; } 263 operator bool () { return !!av; }
274}; 264};
275 265
276// compatibility support, should be removed when no longer needed 266// compatibility support, should be removed when no longer needed
… …
285 char *last_value; 275 char *last_value;
286 276
287 operator bool () { return !!text; } 277 operator bool () { return !!text; }
288 278
289 object_thawer (const char *filename = 0); 279 object_thawer (const char *filename = 0);
280 object_thawer (const char *data, AV *perlav);
290 ~object_thawer (); 281 ~object_thawer ();
291 282
292 void get (data_type type, void *obj, attachable_base *ext, int oid); 283 void get (data_type type, void *obj, attachable_base *ext, int oid);
293 284
294 template<class subclass> 285 template<class subclass>

Diff Legend

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