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

Comparing deliantra/server/common/player.C (file contents):
Revision 1.14 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.76 by root, Sat Nov 17 23:40:00 2018 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 20 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <global.h> 26#include <global.h>
26#include <funcpoint.h> 27
28//+GPL
27 29
28/* Determine if the attacktype represented by the 30/* Determine if the attacktype represented by the
29 * specified attack-number is enabled for dragon players. 31 * specified attack-number is enabled for dragon players.
30 * A dragon player (quetzal) can gain resistances for 32 * A dragon player (quetzal) can gain resistances for
31 * all enabled attacktypes. 33 * all enabled attacktypes.
… …
39 41
40 return 0; 42 return 0;
41} 43}
42 44
43/* 45/*
44 * returns true if the adressed object 'ob' is a player
45 * of the dragon race.
46 */
47int
48is_dragon_pl (const object *op)
49{
50 if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0)
51 return 1;
52 return 0;
53}
54
55/*
56 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 46 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
57 */ 47 */
58bool 48bool
59player::save_pl (object_freezer &freezer) 49player::save_pl (object_freezer &freezer)
60{ 50{
61 INVOKE_PLAYER (SAVE, ob->contr); 51 INVOKE_PLAYER (SAVE, ob->contr);
62 52
63 int wiz = ob->flag [FLAG_WIZ]; 53 int wiz = ob->flag [FLAG_WIZ];
64 54
65 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 55 /* Eneq(@csd.uu.se): If we have an open container hide it. */
66 object *container = ob->container; 56 object *container = ob->container_ ();
67 ob->container = 0; 57 ob->container = 0;
68 58
59 if (ob->map)
60 maplevel = ob->map->path;
61
69#define PL_OUT(k) freezer.put (KW_ ## k, k) 62#define PL_OUT(k) freezer.put (KW(k), k)
70#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 63#define PL_OUT2(k,v) freezer.put (KW(k), v)
71 64
72 PL_OUT (password); 65 PL_OUT (password);
73 PL_OUT2 (title, own_title); 66 PL_OUT2 (title, own_title);
67 PL_OUT (gender);
68 PL_OUT (hintmode);
74 PL_OUT (gen_hp); 69 PL_OUT (gen_hp);
75 PL_OUT (gen_sp); 70 PL_OUT (gen_sp);
76 PL_OUT (gen_grace); 71 PL_OUT (gen_grace);
77 PL_OUT (listening);
78 PL_OUT (shoottype);
79 PL_OUT (bowtype); 72 PL_OUT (bowtype);
80 PL_OUT (petmode); 73 PL_OUT (petmode);
81 PL_OUT (peaceful); 74 PL_OUT (peaceful);
82 PL_OUT (digestion); 75 PL_OUT (digestion);
83 PL_OUT2 (pickup, mode); 76 PL_OUT2 (pickup, mode);
84 PL_OUT (outputs_sync); 77 PL_OUT (outputs_sync);
85 PL_OUT (outputs_count); 78 PL_OUT (outputs_count);
86 79
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 80 freezer.put (KW(usekeys), usekeys == key_inventory ? CS(key_inventory) : (usekeys == keyrings ? CS(keyrings) : CS(containers)));
88 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 81 freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
89 82
90 if (ob->map) PL_OUT2 (map, ob->map->path); 83 PL_OUT2 (map, maplevel);
91
92 PL_OUT (savebed_map); 84 PL_OUT (savebed_map);
93 PL_OUT (bed_x); 85 PL_OUT (bed_x);
94 PL_OUT (bed_y); 86 PL_OUT (bed_y);
95 PL_OUT (weapon_sp); 87 PL_OUT (weapon_sp);
88 PL_OUT (weapon_sp_left);
96 PL_OUT2 (Str, orig_stats.Str); 89 PL_OUT2 (str, orig_stats.Str);
97 PL_OUT2 (Dex, orig_stats.Dex); 90 PL_OUT2 (dex, orig_stats.Dex);
98 PL_OUT2 (Con, orig_stats.Con); 91 PL_OUT2 (con, orig_stats.Con);
99 PL_OUT2 (Int, orig_stats.Int); 92 PL_OUT2 (int, orig_stats.Int);
100 PL_OUT2 (Pow, orig_stats.Pow); 93 PL_OUT2 (pow, orig_stats.Pow);
101 PL_OUT2 (Wis, orig_stats.Wis); 94 PL_OUT2 (wis, orig_stats.Wis);
102 PL_OUT2 (Cha, orig_stats.Cha); 95 PL_OUT2 (cha, orig_stats.Cha);
103 96
104 PL_OUT2 (lev_array, min (ob->level, 10)); 97 PL_OUT2 (lev_array, 10);
105 98
106 for (int i = 1; i <= last_level && i <= 10; i++) 99 for (int i = 1; i <= 10; i++)
107 { 100 {
108 fprintf (freezer, "%d\n", levhp[i]); 101 freezer.add (levhp [i]); freezer.add ('\n');
109 fprintf (freezer, "%d\n", levsp[i]); 102 freezer.add (levsp [i]); freezer.add ('\n');
110 fprintf (freezer, "%d\n", levgrace[i]); 103 freezer.add (levgrace[i]); freezer.add ('\n');
111 } 104 }
112 105
113 freezer.put (ob->contr); 106 freezer.put (ob->contr);
114 freezer.put (KW_endplst); 107 freezer.put (KW(endplst));
115 108
116 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 109 ob->clr_flag (FLAG_WIZ);
117 CLEAR_FLAG (ob, FLAG_WIZ); 110 ob->write (freezer);
118 save_object (freezer, ob, 1); /* don't check and don't remove */
119
120 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
121 111
122 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 112 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
123 ob->container = container; 113 ob->container = container;
124 114
125 ob->flag [FLAG_WIZ] = wiz; 115 ob->flag [FLAG_WIZ] = wiz;
… …
127 INVOKE_PLAYER (SAVE_DONE, ob->contr); 117 INVOKE_PLAYER (SAVE_DONE, ob->contr);
128 118
129 return true; 119 return true;
130} 120}
131 121
122//-GPL
123
132bool 124bool
133player::save_pl (const char *path) 125player::save_pl (const char *path)
134{ 126{
135 object_freezer freezer; 127 object_freezer freezer;
136 128
… …
139 131
140 return freezer.save (path); 132 return freezer.save (path);
141} 133}
142 134
143player * 135player *
144player::load_pl (object_thawer &thawer) 136player::load_pl (object_thawer &f)
145{ 137{
138 int maxerrs = 20;
139
146 player *pl = new player; 140 player *pl = new player;
147 141
148 pl->last_save_time = time (0);
149 pl->savebed_map = first_map_path; 142 pl->savebed_map = first_map_path;
150 143
151 /* Loop through the file, loading the rest of the values */ 144 /* Loop through the file, loading the rest of the values */
152 for (;;) 145 for (;;)
153 { 146 {
154 keyword kw = thawer.get_kv ();
155
156 switch (kw) 147 switch (f.kw)
157 { 148 {
158 case KW_EOF: 149 case KW_EOF:
159 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 150 LOG (llevError, "%s: unexpected EOF while reading player header\n", f.name);
160 delete pl; 151 goto failure;
152
153 default:
154 LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
155 if (!--maxerrs) goto failure;
161 return 0; 156 break;
162 157
163 case KW_ERROR: 158 case KW_ERROR:
164 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 159 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", f.name, f.kw_str, f.value);
160 if (!--maxerrs) goto failure;
165 break; 161 break;
166 162
167 case KW_endplst: 163 case KW_endplst:
164 f.next ();
165
166 if (object *op = pl->ob->read (f))
167 pl->set_object (op);
168 else
168 goto done; 169 goto failure;
169 170
171 INVOKE_PLAYER (LOAD, pl);
172
173 return pl;
174
170 case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; 175 case KW_oid: f.get (pl, f.get_sint32 ()); break;
171 case KW_password: assign (pl->password , thawer.get_str ()); break; 176 case KW_password: assign (pl->password , f.get_str ()); break;
172 case KW_title: assign (pl->own_title, thawer.get_str ()); break; 177 case KW_title: assign (pl->own_title, f.get_str ()); break;
173 case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break;
174 case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; 178 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
175 case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; 179 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
176 case KW_listening: thawer.get (pl->listening); break; 180 case KW_gender: f.get (pl->gender); break;
181 case KW_hintmode: f.get (pl->hintmode); break;
182 case KW_listening: /*TODO*/; break;
177 case KW_peaceful: thawer.get (pl->peaceful); break; 183 case KW_peaceful: f.get (pl->peaceful); break;
178 case KW_digestion: thawer.get (pl->digestion); break; 184 case KW_digestion: f.get (pl->digestion); break;
179 case KW_pickup: thawer.get (pl->mode); break; 185 case KW_pickup: f.get (pl->mode); break;
180 case KW_outputs_sync: thawer.get (pl->outputs_sync); break; 186 case KW_outputs_sync: f.get (pl->outputs_sync); break;
181 case KW_outputs_count: thawer.get (pl->outputs_count); break; 187 case KW_outputs_count: f.get (pl->outputs_count); break;
182 case KW_map: thawer.get (pl->maplevel); break; 188 case KW_map: f.get (pl->maplevel); break;
183 case KW_savebed_map: thawer.get (pl->savebed_map); break; 189 case KW_savebed_map: f.get (pl->savebed_map); break;
184 case KW_bed_x: thawer.get (pl->bed_x); break; 190 case KW_bed_x: f.get (pl->bed_x); break;
185 case KW_bed_y: thawer.get (pl->bed_y); break; 191 case KW_bed_y: f.get (pl->bed_y); break;
186 case KW_weapon_sp: thawer.get (pl->weapon_sp); break; 192 case KW_weapon_sp: f.get (pl->weapon_sp); break;
193 case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
194
195 case KW_Str: // uppercase alias
187 case KW_Str: thawer.get (pl->orig_stats.Str); break; 196 case KW_str: f.get (pl->orig_stats.Str); break;
197 case KW_Dex: // uppercase alias
188 case KW_Dex: thawer.get (pl->orig_stats.Dex); break; 198 case KW_dex: f.get (pl->orig_stats.Dex); break;
199 case KW_Con: // uppercase alias
189 case KW_Con: thawer.get (pl->orig_stats.Con); break; 200 case KW_con: f.get (pl->orig_stats.Con); break;
201 case KW_Int: // uppercase alias
190 case KW_Int: thawer.get (pl->orig_stats.Int); break; 202 case KW_int: f.get (pl->orig_stats.Int); break;
203 case KW_Pow: // uppercase alias
191 case KW_Pow: thawer.get (pl->orig_stats.Pow); break; 204 case KW_pow: f.get (pl->orig_stats.Pow); break;
205 case KW_Wis: // uppercase alias
192 case KW_Wis: thawer.get (pl->orig_stats.Wis); break; 206 case KW_wis: f.get (pl->orig_stats.Wis); break;
207 case KW_Cha: // uppercase alias
193 case KW_Cha: thawer.get (pl->orig_stats.Cha); break; 208 case KW_cha: f.get (pl->orig_stats.Cha); break;
209
194 case KW_gen_hp: thawer.get (pl->gen_hp); break; 210 case KW_gen_hp: f.get (pl->gen_hp); break;
195 case KW_gen_sp: thawer.get (pl->gen_sp); break; 211 case KW_gen_sp: f.get (pl->gen_sp); break;
196 case KW_gen_grace: thawer.get (pl->gen_grace); break; 212 case KW_gen_grace: f.get (pl->gen_grace); break;
197 213
198 case KW_usekeys: 214 case KW_usekeys:
199 if (!strcmp (thawer.get_str (), "key_inventory")) 215 if (!strcmp (f.get_str (), "key_inventory"))
200 pl->usekeys = key_inventory; 216 pl->usekeys = key_inventory;
201 else if (!strcmp (thawer.get_str (), "keyrings")) 217 else if (!strcmp (f.get_str (), "keyrings"))
202 pl->usekeys = keyrings; 218 pl->usekeys = keyrings;
203 else if (!strcmp (thawer.get_str (), "containers")) 219 else if (!strcmp (f.get_str (), "containers"))
204 pl->usekeys = containers; 220 pl->usekeys = containers;
205 else 221 else
206 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", thawer.get_str ()); 222 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", f.get_str ());
207 break; 223 break;
208 224
209 case KW_unapply: 225 case KW_unapply:
210 if (!strcmp (thawer.get_str (), "unapply_nochoice")) 226 if (!strcmp (f.get_str (), "unapply_nochoice"))
211 pl->unapply = unapply_nochoice; 227 pl->unapply = unapply_nochoice;
212 else if (!strcmp (thawer.get_str (), "unapply_never")) 228 else if (!strcmp (f.get_str (), "unapply_never"))
213 pl->unapply = unapply_never; 229 pl->unapply = unapply_never;
214 else if (!strcmp (thawer.get_str (), "unapply_always")) 230 else if (!strcmp (f.get_str (), "unapply_always"))
215 pl->unapply = unapply_always; 231 pl->unapply = unapply_always;
216 else 232 else
217 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", thawer.get_str ()); 233 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", f.get_str ());
218 break; 234 break;
219 235
220 case KW_lev_array: 236 case KW_lev_array:
221 { 237 {
222 int count = thawer.get_sint32 (); 238 int count = f.get_sint32 ();
223 239
224 for (int i = 1; i <= count; i++) 240 for (int i = 1; i <= count; i++)
225 { 241 {
226 char line[128]; 242 f.next_line (); f.get (pl->levhp [i]);
227 243 f.next_line (); f.get (pl->levsp [i]);
228 fgets (line, 128, thawer); pl->levhp [i] = atoi (line); 244 f.next_line (); f.get (pl->levgrace[i]);
229 fgets (line, 128, thawer); pl->levsp [i] = atoi (line);
230 fgets (line, 128, thawer); pl->levgrace[i] = atoi (line);
231 } 245 }
232 } 246 }
233 break; 247 break;
248 }
234 249
250 f.next ();
251 }
252
253failure:
254 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
255
256 if (pl->ob)
257 pl->ob->destroy ();
258
259 pl->destroy ();
260
261 return 0;
262}
263
264const_utf8_string
265player::killer_name () const
266{
267 static char buf [2048];
268
269 if (!killer)
270 return "a dungeon collapse";
271 else if (killer->contr)
272 snprintf (buf, sizeof (buf), "%s the %s", &killer->name,
273 *killer->contr->own_title ? killer->contr->own_title : killer->contr->title);
274 else if (killer->type == DEEP_SWAMP)
275 snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
276 else if (killer->owner)
277 snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
278 else
279 return &killer->name;
280
281 return buf;
282}
283
284// expand one level of cfpod
285// end == -2, till '\n'
286// end == -1, till '>'
287// end == 0, till eos
288// end >= 1, levels of " >>>"
289// pod sequences not handled: F, S, X
290static const char *
291expand_cfpod (int hintmode, int gender, dynbuf_text &buf, const char *cfpod, int end = 0)
292{
293 static dynbuf_text nest(128, 128);
294
295 for (;;)
296 switch (char ch = *cfpod++)
297 {
298 case 0:
299 return cfpod - 1;
300
301 case ' ':
302 // verbatim block?
303 if (!buf.size () && !end)
304 {
305 --cfpod;
306 goto verbatim;
307 }
308
309 if (end < 1)
310 goto passthrough;
311
312 for (int i = 0; i < end; ++i)
313 if (cfpod [i] != '>')
314 goto passthrough;
315
316 return cfpod + end;
317
318 case '>':
319 if (end != -1)
320 {
321 buf << "&gt;";
322 break;
323 }
324
325 return cfpod;
326
327 case '&':
328 buf << "&amp;";
329 break;
330
331 case '<':
332 buf << "&lt;";
333 break;
334
335 case '\r':
336 buf << '\n';
337 /* \r\n+ becomes one or more newlines */
338 while (*cfpod == '\n')
339 buf << *cfpod++;
340 break;
341
342 case '\n':
343 if (end == -2)
344 return cfpod;
345
346 // \n\ => newline, tt
347 // \n\n => \n\n
348 // \n => single space
349
350 // two or more newlines will be copied verbatim, one is replaced by space
351 if (*cfpod == '\n')
352 {
353 --cfpod;
354 do
355 buf << *cfpod++;
356 while (*cfpod == '\n');
357 }
358 else if (*cfpod == ' ')
359 buf << '\n';
360 else
361 buf << ' ';
362
363 // verbatim block?
364 if (*cfpod == ' ')
365 goto verbatim;
366
367 break;
368
369 case 'B': case 'C': case 'E': case 'G': case 'H':
370 case 'I': case 'L': case 'T': case 'U': case 'Z':
371 {
372 int end = 0;
373
374 while (cfpod [end] == '<')
375 ++end;
376
377 if (!end)
378 goto passthrough;
379
380 if (end == 1 || cfpod [end] != ' ')
381 {
382 end = -1;
383 ++cfpod;
384 }
385 else
386 cfpod += end + 1;
387
388 const char *pfx, *sfx;
389
390 switch (ch)
391 {
392 case 'B': pfx = "<b>" ; sfx = "</b>" ; break;
393 case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
394 case 'E': pfx = "&" ; sfx = ";" ; break;
395 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
396 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
397 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
398 case 'Z': pfx = "" ; sfx = "" ; break;
399
400 case 'L': // link, not really supported - always use first (or only) component
401 {
402 cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
403 nest << '\0'; // zero-terminate
404
405 const char *str = nest.linearise ();
406 const char *sep = strchr (str, '|');
407
408 buf.add (str, sep ? sep - str : nest.size ());
409
410 nest.clear ();
411
412 goto skip;
413 }
414
415 case 'H': // hint
416 {
417 if (hintmode)
418 {
419 cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
420 nest.clear ();
421
422 if (hintmode == 1)
423 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
424 else
425 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
426 ++cfpod;
427
428 goto skip;
429 }
430 else
431 {
432 pfx = "<fg name=\"lightblue\">[Hint: ";
433 sfx = "]</fg>";
434 }
435 }
436 break;
437
438 case 'G': // gender
439 {
440 cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
441 nest << '\0'; // zero-terminate
442
443 const char *str = nest.linearise ();
444 const char *sep = strchr (str, '|');
445
446 if (sep)
447 {
448 if (gender)
449 buf.add (sep + 1, nest.size () - (sep - str) - 2);
450 else
451 buf.add (str, sep - str);
452 }
453
454 nest.clear ();
455
456 goto skip;
457 }
458
459 default:
460 pfx = "UNKNOWN_DIRECTIVE{";
461 sfx = "}";
462 break;
463 }
464
465 buf << pfx;
466 cfpod = expand_cfpod (hintmode, gender, buf, cfpod, end);
467 buf << sfx;
468 }
469
470 break;
471
235 default: 472 default:
236 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]); 473 passthrough:
474 buf << ch;
475 skip:
237 break; 476 break;
477
478 verbatim:
479 // elements cannot currently span multiple lines
480 do
481 {
482 buf << "<tt>";
483 cfpod = expand_cfpod (hintmode, gender, buf, cfpod, -2);
484 buf << "</tt>\n";
485
486 while (*cfpod == '\n')
487 buf << *cfpod++;
488 }
489 while (*cfpod == ' ');
490
491 break;
238 } 492 }
239 } 493}
240 494
241done: 495dynbuf_text *
242 /* this loads the standard objects values. */ 496player::expand_cfpod (int hintmode, int gender, const_utf8_string cfpod)
243 pl->set_object (object::create ()); 497{
498 static dynbuf_text buf(65536, 1024);
499 buf.clear ();
244 500
245 if (!load_object (thawer, pl->ob, 0)) 501 ::expand_cfpod (hintmode, gender, buf, cfpod);
246 {
247 pl->ob->destroy ();
248 delete pl;
249 return 0;
250 }
251 502
252 INVOKE_PLAYER (LOAD, pl);
253
254 return pl; 503 return &buf;
255} 504}
256 505
257player * 506dynbuf_text *
258player::load_pl (const char *path) 507player::expand_cfpod (const_utf8_string cfpod) const
259{ 508{
260 object_thawer thawer (path); 509 return expand_cfpod (hintmode, gender, cfpod);
261
262 if (!thawer)
263 return 0;
264
265 return load_pl (thawer);
266} 510}
267 511

Diff Legend

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