[ViewVC] Diff of: cvs/deliantra/server/common/player.C

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

Diff Legend

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

Comparing deliantra/server/common/player.C (file contents): Revision 1.16 by root, Mon Jan 8 19:25:52 2007 UTC vs. Revision 1.67 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/player.C (file contents):
Revision 1.16 by root, Mon Jan 8 19:25:52 2007 UTC vs.
Revision 1.67 by root, Sun Apr 11 00:34:05 2010 UTC