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.21 by root, Sun Sep 3 22:45:56 2006 UTC vs.
Revision 1.26 by root, Sat Sep 16 22:24:12 2006 UTC

… …
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), (l)
57#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<struct object *> (o) 57#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<object *> (o)
58#define ARG_MAP(o) DT_MAP , (void *)static_cast<struct mapstruct *> (o) 58#define ARG_MAP(o) DT_MAP , (void *)static_cast<maptile *> (o)
59#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<struct pl *> (o) 59#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<player *> (o)
60#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<struct archetype *> (o) 60#define ARG_ARCH(o) DT_ARCH , (void *)static_cast<archetype *> (o)
61#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<struct party *> (o) 61#define ARG_PARTY(o) DT_PARTY , (void *)static_cast<party *> (o)
62#define ARG_REGION(o) DT_REGION, (void *)static_cast<struct 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
65 65
66// all these return true when the normal event processing should be skipped (if any) 66// all these return true when the normal event processing should be skipped (if any)
67#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END) 67#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
… …
87 87
88 void clear (); // called when free'ing objects 88 void clear (); // called when free'ing objects
89 void optimise (); // possibly save some memory by destroying unneeded data 89 void optimise (); // possibly save some memory by destroying unneeded data
90 void instantiate (data_type type, void *obj); 90 void instantiate (data_type type, void *obj);
91 91
92 void attachable_init () 92 void attachable_clear ()
93 { 93 {
94 self = 0; 94 self = 0;
95 cb = 0; 95 cb = 0;
96 attach = 0; 96 attach = 0;
97 }
98
99 attachable_base ()
100 {
101 attachable_clear ();
102 }
103
104 ~attachable_base ()
105 {
106 clear ();
107 }
108
109 attachable_base (const attachable_base &src)
110 : self (0), cb (0), attach (src.attach)
111 {
112 }
113
114 attachable_base &operator = (const attachable_base &src)
115 {
116 clear ();
117 attach = src.attach;
118 return *this;
97 } 119 }
98}; 120};
99 121
100// objects attachable from perl (or any other extension) should include or 122// objects attachable from perl (or any other extension) should include or
101// derive using the curiously recurring template pattern, to avoid 123// derive using the curiously recurring template pattern, to avoid
… …
128 //TODO//temporary 150 //TODO//temporary
129 void put (const char *k, const char *v) 151 void put (const char *k, const char *v)
130 { 152 {
131 add (k); 153 add (k);
132 154
133 //if (v) 155 if (v)
134 add (' '); //TODO//cf compatibility always add space 156 add (' '), add (v);
135 if (v)
136 add (v);
137 157
138 add ('\n'); 158 add ('\n');
139 } 159 }
140 160
141 //TODO//temporary 161 //TODO//temporary
… …
145 add (' '); 165 add (' ');
146 add (sint32 (v)); 166 add (sint32 (v));
147 add ('\n'); 167 add ('\n');
148 } 168 }
149 169
170#if 1
150 void put (keyword k, const char *v) 171 void put (keyword k, const char *v)
151 { 172 {
152 int klen = keyword_len [k]; 173 int klen = keyword_len [k];
153 int vlen = v ? strlen (v) : 0; 174 int vlen = v ? strlen (v) + 1 : 0;
154 175
155 char *p = (char *)alloc (klen + 1 + vlen + 1); 176 char *p = (char *)alloc (klen + vlen + 1);
156 177
157 memcpy (p, keyword_str [k], klen); p += klen; 178 memcpy (p, keyword_str [k], klen); p += klen;
179
180 if (v)
181 {
158 *p++ = ' '; //TODO//cf compatibility always add space 182 *p++ = ' '; vlen--; //TODO//cf compatibility always add space
159 memcpy (p, v, vlen); p += vlen; 183 memcpy (p, v, vlen); p += vlen;
184 }
185
160 *p = '\n'; 186 *p = '\n';
161 } 187 }
188#endif
189
190#if 0
191 void put (keyword k, const shstr &v)
192 {
193 int klen = keyword_len [k];
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 }
208#endif
162 209
163 void put (keyword k, double v) 210 void put (keyword k, double v)
164 { 211 {
165 char buf [128]; 212 char buf [128];
166 213
… …
183 add (' '); 230 add (' ');
184 add (v); 231 add (v);
185 add ('\n'); 232 add ('\n');
186 } 233 }
187 234
188 void put (keyword kbeg, keyword kend, const char *v) 235 void put (keyword kbeg, keyword kend, const shstr &v)
189 { 236 {
190 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); 237 add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n');
191 238
192 if (v) 239 if (v)
193 { 240 {
… …
211 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } 258 void put (keyword k, unsigned long long v) { put_(k, (sint64)v); }
212 259
213 template<typename T> 260 template<typename T>
214 void put (keyword k, T *v) 261 void put (keyword k, T *v)
215 { 262 {
263 if (v)
264 put (k, v->name);
265 else
216 put (k, v ? (const char *)v->name : 0); 266 put (k, (const char *)0);
217 } 267 }
218 268
219 bool save (const char *filename); 269 bool save (const char *filename);
220 270
221 operator bool () { return !!av; } 271 operator bool () { return !!av; }

Diff Legend

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