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.10 by root, Sun Aug 27 17:59:26 2006 UTC vs.
Revision 1.11 by root, Mon Aug 28 07:07:41 2006 UTC

… …
14// could have used templates, but a more traditional C api 14// could have used templates, but a more traditional C api
15// uses more explicit typing which is ok for this purpose. 15// uses more explicit typing which is ok for this purpose.
16enum data_type 16enum data_type
17{ 17{
18 DT_END, // no further arguments 18 DT_END, // no further arguments
19 DT_AV, // perl-only av that needs to be flattened out
19 DT_INT, 20 DT_INT,
20 DT_INT64, 21 DT_INT64,
21 DT_DOUBLE, 22 DT_DOUBLE,
22 DT_STRING, // 0-terminated string 23 DT_STRING, // 0-terminated string
23 DT_DATA, // string + length 24 DT_DATA, // string + length
… …
25 DT_MAP, 26 DT_MAP,
26 DT_PLAYER, 27 DT_PLAYER,
27 DT_ARCH, 28 DT_ARCH,
28 DT_PARTY, 29 DT_PARTY,
29 DT_REGION, 30 DT_REGION,
30 DT_AV, // av that needs to be flattened out
31 31
32 NUM_DATA_TYPES 32 NUM_DATA_TYPES
33}; 33};
34 34
35enum event_klass 35enum event_klass
36{ 36{
37 KLASS_NONE,
37 KLASS_GLOBAL, 38 KLASS_GLOBAL,
38 KLASS_PLAYER, 39 KLASS_PLAYER,
39 KLASS_OBJECT, 40 KLASS_OBJECT,
40 KLASS_MAP, 41 KLASS_MAP,
41}; 42};
… …
46# include "eventinc.h" 47# include "eventinc.h"
47# undef def 48# undef def
48 NUM_EVENT_TYPES 49 NUM_EVENT_TYPES
49}; 50};
50 51
52#define ARG_AV(o) DT_AV , static_cast<AV *> (o)
51#define ARG_INT(v) DT_INT , static_cast<int> (v) 53#define ARG_INT(v) DT_INT , static_cast<int> (v)
52#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v) 54#define ARG_INT64(v) DT_INT64 , static_cast<sint64> (v)
53#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v) 55#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
54#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v) 56#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
55#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), (l) 57#define ARG_DATA(s,l) DT_DATA , static_cast<const void *> (s), (l)
… …
107 109
108struct object_freezer 110struct object_freezer
109{ 111{
110 const char *filename; 112 const char *filename;
111 void *av; 113 void *av;
112 int idx;
113 114
114 object_freezer (const char *filename); 115 object_freezer (const char *filename);
115 ~object_freezer (); 116 ~object_freezer ();
116 117
117 void put (attachable_base *ext); 118 void put (FILE *fp, attachable_base *ext);
118 119
119 template<class subclass> 120 template<class subclass>
120 void put (attachable<subclass> *obj) 121 void put (FILE *fp, attachable<subclass> *obj)
121 { 122 {
122 put ((attachable_base *)obj); 123 put (fp, (attachable_base *)obj);
123 } 124 }
124 125
125 void finish (); 126 void finish ();
126}; 127};
127 128
128struct object_thawer 129struct object_thawer
129{ 130{
130 void *av; 131 void *av;
131 int idx;
132 132
133 object_thawer (const char *filename = 0); 133 object_thawer (const char *filename = 0);
134 ~object_thawer (); 134 ~object_thawer ();
135 135
136 void get (data_type type, void *obj, attachable_base *ext); 136 void get (data_type type, void *obj, attachable_base *ext, int oid);
137 137
138 template<class subclass> 138 template<class subclass>
139 void get (attachable<subclass> *obj) 139 void get (attachable<subclass> *obj, int oid)
140 { 140 {
141 if (av) 141 if (av)
142 get (subclass::get_dt (), (subclass *)obj, obj); 142 get (subclass::get_dt (), (subclass *)obj, obj, oid);
143 } 143 }
144 144
145 void finish (); 145 void finish ();
146}; 146};
147 147

Diff Legend

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