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.26 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.32 by root, Fri Nov 17 19:40:54 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
… …
73#define INVOKE_MAP(event, map, ...) INVOKE_(EVENT_ ## MAP ## _ ## event, ARG_MAP (map) , ## __VA_ARGS__) 73#define INVOKE_MAP(event, map, ...) INVOKE_(EVENT_ ## MAP ## _ ## event, ARG_MAP (map) , ## __VA_ARGS__)
74 74
75//TODO should index into @result 75//TODO should index into @result
76#define RESULT(idx,type) cfperl_result_ ## type (idx) 76#define RESULT(idx,type) cfperl_result_ ## type (idx)
77#define RESULT_INT(idx) RESULT(idx, INT) 77#define RESULT_INT(idx) RESULT(idx, INT)
78#define RESULT_MAP(idx) RESULT(idx, MAP)
78 79
79bool cfperl_invoke (event_type event, ...); 80bool cfperl_invoke (event_type event, ...);
80int cfperl_result_INT (int idx); 81int cfperl_result_INT (int idx);
82int cfperl_result_MAP (int idx);
81 83
82struct attachable_base 84struct attachable_base
83{ 85{
84 SV *self; 86 SV *self;
85 AV *cb; // CF+ perl self and callback 87 AV *cb; // CF+ perl self and callback
… …
145 void put (attachable<subclass> *obj) 147 void put (attachable<subclass> *obj)
146 { 148 {
147 put ((attachable_base *)obj); 149 put ((attachable_base *)obj);
148 } 150 }
149 151
150 //TODO//temporary 152 // used only for user-defined key-value pairs
151 void put (const char *k, const char *v) 153 void put (const shstr &k, const shstr &v)
152 { 154 {
153 add (k); 155 add (k);
154 156
155 if (v) 157 if (v)
156 add (' '), add (v); 158 add (' '), add (v);
157 159
158 add ('\n'); 160 add ('\n');
159 } 161 }
160 162
161 //TODO//temporary 163 //TODO//temporary, used only for saving body locations
162 void put (const char *k, int v) 164 void put (const char *k, int v)
163 { 165 {
164 add (k); 166 add (k);
165 add (' '); 167 add (' ');
166 add (sint32 (v)); 168 add (sint32 (v));
167 add ('\n'); 169 add ('\n');
168 } 170 }
169 171
170#if 1 172 template<typename T>
171 void put (keyword k, const char *v) 173 void put_string (keyword k, const T &v)
172 { 174 {
173 int klen = keyword_len [k]; 175 int klen = keyword_len [k];
174 int vlen = v ? strlen (v) + 1 : 0; 176 int vlen = v ? strlen (v) + 1 : 0;
175 177
176 char *p = (char *)alloc (klen + vlen + 1); 178 char *p = (char *)alloc (klen + vlen + 1);
177 179
178 memcpy (p, keyword_str [k], klen); p += klen; 180 memcpy (p, keyword_str [k], klen); p += klen;
179 181
180 if (v) 182 if (v)
181 { 183 {
182 *p++ = ' '; vlen--; //TODO//cf compatibility always add space 184 *p++ = ' '; vlen--;
183 memcpy (p, v, vlen); p += vlen; 185 memcpy (p, v, vlen); p += vlen;
184 } 186 }
185 187
186 *p = '\n'; 188 *p = '\n';
187 } 189 }
188#endif
189 190
190#if 0 191 void put (keyword k, const char *v)
192 {
193 put_string (k, v);
194 }
195
191 void put (keyword k, const shstr &v) 196 void put (keyword k, const shstr &v)
192 { 197 {
193 int klen = keyword_len [k]; 198 put_string (k, v);
194 int vlen = v ? v.length () + 1 : 0;
195
196 char *p = (char *)alloc (klen + vlen + 1);
197
198 memcpy (p, keyword_str [k], klen); p += klen;
199
200 if (v)
201 {
202 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
203 memcpy (p, v, vlen); p += vlen;
204 }
205
206 *p = '\n';
207 } 199 }
208#endif
209 200
210 void put (keyword k, double v) 201 void put (keyword k, double v)
211 { 202 {
212 char buf [128]; 203 char buf [128];
213 204
… …
256 void put (keyword k, unsigned long v) { put_(k, (sint64)v); } 247 void put (keyword k, unsigned long v) { put_(k, (sint64)v); }
257 void put (keyword k, signed long long v) { put_(k, (sint64)v); } 248 void put (keyword k, signed long long v) { put_(k, (sint64)v); }
258 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 249 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
259 250
260 template<typename T> 251 template<typename T>
261 void put (keyword k, T *v) 252 void put (keyword k, const T *v)
262 { 253 {
263 if (v) 254 if (v)
264 put (k, v->name); 255 put (k, v->name);
265 else 256 else
266 put (k, (const char *)0); 257 put (k, (const char *)0);
267 } 258 }
268 259
260 template<typename T>
261 void put (keyword k, const refptr<T> &v)
262 {
263 put (k, (T *)v);
264 }
265
269 bool save (const char *filename); 266 bool save (const char *filename);
267 char *as_string (); // like strdup
270 268
271 operator bool () { return !!av; } 269 operator bool () { return !!av; }
272}; 270};
273 271
274// compatibility support, should be removed when no longer needed 272// compatibility support, should be removed when no longer needed
… …
283 char *last_value; 281 char *last_value;
284 282
285 operator bool () { return !!text; } 283 operator bool () { return !!text; }
286 284
287 object_thawer (const char *filename = 0); 285 object_thawer (const char *filename = 0);
286 object_thawer (const char *data, AV *perlav);
288 ~object_thawer (); 287 ~object_thawer ();
289 288
290 void get (data_type type, void *obj, attachable_base *ext, int oid); 289 void get (data_type type, void *obj, attachable_base *ext, int oid);
291 290
292 template<class subclass> 291 template<class subclass>

Diff Legend

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