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

Comparing deliantra/server/common/player.C (file contents):
Revision 1.18 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.73 by root, Wed Nov 21 12:59:44 2012 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,2011,2012 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
53	return 0;
54	}
55
56	/*
57	* 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
58	*/	46	*/
59	bool	47	bool
60	player::save_pl (object_freezer &freezer)	48	player::save_pl (object_freezer &freezer)
61	{	49	{
62	INVOKE_PLAYER (SAVE, ob->contr);	50	INVOKE_PLAYER (SAVE, ob->contr);
63		51
64	int wiz = ob->flag [FLAG_WIZ];	52	int wiz = ob->flag [FLAG_WIZ];
65		53
66	/* 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. */
67	object *container = ob->container;	55	object *container = ob->container_ ();
68	ob->container = 0;	56	ob->container = 0;
69		57
		58	if (ob->map)
		59	maplevel = ob->map->path;
		60
70	#define PL_OUT(k) freezer.put (KW_ ## k, k)	61	#define PL_OUT(k) freezer.put (KW(k), k)
71	#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)	62	#define PL_OUT2(k,v) freezer.put (KW(k), v)
72		63
73	PL_OUT (password);	64	PL_OUT (password);
74	PL_OUT2 (title, own_title);	65	PL_OUT2 (title, own_title);
		66	PL_OUT (gender);
		67	PL_OUT (hintmode);
75	PL_OUT (gen_hp);	68	PL_OUT (gen_hp);
76	PL_OUT (gen_sp);	69	PL_OUT (gen_sp);
77	PL_OUT (gen_grace);	70	PL_OUT (gen_grace);
78	PL_OUT (listening);
79	PL_OUT (shoottype);
80	PL_OUT (bowtype);	71	PL_OUT (bowtype);
81	PL_OUT (petmode);	72	PL_OUT (petmode);
82	PL_OUT (peaceful);	73	PL_OUT (peaceful);
83	PL_OUT (digestion);	74	PL_OUT (digestion);
84	PL_OUT2 (pickup, mode);	75	PL_OUT2 (pickup, mode);
85	PL_OUT (outputs_sync);	76	PL_OUT (outputs_sync);
86	PL_OUT (outputs_count);	77	PL_OUT (outputs_count);
87		78
88	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)));
89	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)));
90		81
91	PL_OUT2 (map, maplevel);	82	PL_OUT2 (map, maplevel);
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	{
146	int maxerrs = 10;	137	int maxerrs = 20;
147		138
148	player *pl = new player;	139	player *pl = new player;
149		140
150	pl->savebed_map = first_map_path;	141	pl->savebed_map = first_map_path;
151
152	/* this loads the standard objects values. */
153	pl->set_object (object::create ());
154		142
155	/* Loop through the file, loading the rest of the values */	143	/* Loop through the file, loading the rest of the values */
156	for (;;)	144	for (;;)
157	{	145	{
158	keyword kw = thawer.get_kv ();
159
160	switch (kw)	146	switch (f.kw)
161	{	147	{
162	case KW_EOF:	148	case KW_EOF:
163	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);
164	goto failure;	150	goto failure;
165		151
166	default:	152	default:
167	LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);	153	LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
168	if (!--maxerrs) goto failure;	154	if (!--maxerrs) goto failure;
169	break;	155	break;
170		156
171	case KW_ERROR:	157	case KW_ERROR:
172	LOG (llevError, "%s: parse 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);
173	if (!--maxerrs) goto failure;	159	if (!--maxerrs) goto failure;
174	break;	160	break;
175		161
176	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
177	goto done;	168	goto failure;
178		169
		170	INVOKE_PLAYER (LOAD, pl);
		171
		172	return pl;
		173
179	case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break;	174	case KW_oid: f.get (pl, f.get_sint32 ()); break;
180	case KW_password: assign (pl->password , thawer.get_str ()); break;	175	case KW_password: assign (pl->password , f.get_str ()); break;
181	case KW_title: assign (pl->own_title, thawer.get_str ()); break;	176	case KW_title: assign (pl->own_title, f.get_str ()); break;
182	case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break;
183	case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break;	177	case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
184	case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break;	178	case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
185	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;
186	case KW_peaceful: thawer.get (pl->peaceful); break;	182	case KW_peaceful: f.get (pl->peaceful); break;
187	case KW_digestion: thawer.get (pl->digestion); break;	183	case KW_digestion: f.get (pl->digestion); break;
188	case KW_pickup: thawer.get (pl->mode); break;	184	case KW_pickup: f.get (pl->mode); break;
189	case KW_outputs_sync: thawer.get (pl->outputs_sync); break;	185	case KW_outputs_sync: f.get (pl->outputs_sync); break;
190	case KW_outputs_count: thawer.get (pl->outputs_count); break;	186	case KW_outputs_count: f.get (pl->outputs_count); break;
191	case KW_map: thawer.get (pl->maplevel); break;	187	case KW_map: f.get (pl->maplevel); break;
192	case KW_savebed_map: thawer.get (pl->savebed_map); break;	188	case KW_savebed_map: f.get (pl->savebed_map); break;
193	case KW_bed_x: thawer.get (pl->bed_x); break;	189	case KW_bed_x: f.get (pl->bed_x); break;
194	case KW_bed_y: thawer.get (pl->bed_y); break;	190	case KW_bed_y: f.get (pl->bed_y); break;
195	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
196	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
197	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
198	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
199	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
200	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
201	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
202	case KW_Cha: thawer.get (pl->orig_stats.Cha); break;	207	case KW_cha: f.get (pl->orig_stats.Cha); break;
		208
203	case KW_gen_hp: thawer.get (pl->gen_hp); break;	209	case KW_gen_hp: f.get (pl->gen_hp); break;
204	case KW_gen_sp: thawer.get (pl->gen_sp); break;	210	case KW_gen_sp: f.get (pl->gen_sp); break;
205	case KW_gen_grace: thawer.get (pl->gen_grace); break;	211	case KW_gen_grace: f.get (pl->gen_grace); break;
206		212
207	case KW_usekeys:	213	case KW_usekeys:
208	if (!strcmp (thawer.get_str (), "key_inventory"))	214	if (!strcmp (f.get_str (), "key_inventory"))
209	pl->usekeys = key_inventory;	215	pl->usekeys = key_inventory;
210	else if (!strcmp (thawer.get_str (), "keyrings"))	216	else if (!strcmp (f.get_str (), "keyrings"))
211	pl->usekeys = keyrings;	217	pl->usekeys = keyrings;
212	else if (!strcmp (thawer.get_str (), "containers"))	218	else if (!strcmp (f.get_str (), "containers"))
213	pl->usekeys = containers;	219	pl->usekeys = containers;
214	else	220	else
215	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 ());
216	break;	222	break;
217		223
218	case KW_unapply:	224	case KW_unapply:
219	if (!strcmp (thawer.get_str (), "unapply_nochoice"))	225	if (!strcmp (f.get_str (), "unapply_nochoice"))
220	pl->unapply = unapply_nochoice;	226	pl->unapply = unapply_nochoice;
221	else if (!strcmp (thawer.get_str (), "unapply_never"))	227	else if (!strcmp (f.get_str (), "unapply_never"))
222	pl->unapply = unapply_never;	228	pl->unapply = unapply_never;
223	else if (!strcmp (thawer.get_str (), "unapply_always"))	229	else if (!strcmp (f.get_str (), "unapply_always"))
224	pl->unapply = unapply_always;	230	pl->unapply = unapply_always;
225	else	231	else
226	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 ());
227	break;	233	break;
228		234
229	case KW_lev_array:	235	case KW_lev_array:
230	{	236	{
231	int count = thawer.get_sint32 ();	237	int count = f.get_sint32 ();
232		238
233	for (int i = 1; i <= count; i++)	239	for (int i = 1; i <= count; i++)
234	{	240	{
235	char line [32];	241	f.next_line (); f.get (pl->levhp [i]);
236		242	f.next_line (); f.get (pl->levsp [i]);
237	fgets (line, 32, thawer); pl->levhp [i] = atoi (line);	243	f.next_line (); f.get (pl->levgrace[i]);
238	fgets (line, 32, thawer); pl->levsp [i] = atoi (line);
239	fgets (line, 32, thawer); pl->levgrace[i] = atoi (line);
240	}	244	}
241	}	245	}
242	break;	246	break;
243	}	247	}
		248
		249	f.next ();
244	}	250	}
245		251
246	done:
247	if (!load_object (thawer, pl->ob, 0))
248	{
249	pl->ob->destroy ();
250	pl->destroy ();
251	return 0;
252	}
253
254	INVOKE_PLAYER (LOAD, pl);
255
256	return pl;
257
258	failure:	252	failure:
259	LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", thawer.name);	253	LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
260		254
		255	if (pl->ob)
261	pl->ob->destroy ();	256	pl->ob->destroy ();
		257
262	pl->destroy ();	258	pl->destroy ();
263		259
264	return 0;	260	return 0;
265	}	261	}
266		262
267	player *	263	const_utf8_string
268	player::load_pl (const char *path)	264	player::killer_name () const
269	{	265	{
270	object_thawer thawer (path);	266	static char buf [2048];
271		267
272	if (!thawer)	268	if (!killer)
		269	return "a dungeon collapse";
		270	else if (killer->contr)
		271	snprintf (buf, sizeof (buf), "%s the %s", &killer->name,
		272	*killer->contr->own_title ? killer->contr->own_title : killer->contr->title);
		273	else if (killer->type == DEEP_SWAMP)
		274	snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
		275	else if (killer->owner)
		276	snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
		277	else
		278	return &killer->name;
		279
273	return 0;	280	return buf;
274
275	return load_pl (thawer);
276	}	281	}
277		282
		283	// expand one level of cfpod
		284	// end == -2, till '\n'
		285	// end == -1, till '>'
		286	// end == 0, till eos
		287	// end >= 1, levels of " >>>"
		288	static const char *
		289	expand_cfpod (int hintmode, int gender, dynbuf_text &buf, const char *cfpod, int end = 0)
		290	{
		291	static dynbuf_text nest(128, 128);
		292
		293	for (;;)
		294	switch (char ch = *cfpod++)
		295	{
		296	case 0:
		297	return cfpod - 1;
		298
		299	case ' ':
		300	// verbatim block?
		301	if (!buf.size () && !end)
		302	{
		303	--cfpod;
		304	goto verbatim;
		305	}
		306
		307	if (end < 1)
		308	goto passthrough;
		309
		310	for (int i = 0; i < end; ++i)
		311	if (cfpod [i] != '>')
		312	goto passthrough;
		313
		314	return cfpod + end;
		315
		316	case '>':
		317	if (end != -1)
		318	{
		319	buf << ">";
		320	break;
		321	}
		322
		323	return cfpod;
		324
		325	case '&':
		326	buf << "&";
		327	break;
		328
		329	case '<':
		330	buf << "<";
		331	break;
		332
		333	case '\r':
		334	buf << '\n';
		335	/* \r\n+ becomes one or more newlines */
		336	while (*cfpod == '\n')
		337	buf << *cfpod++;
		338	break;
		339
		340	case '\n':
		341	if (end == -2)
		342	return cfpod;
		343
		344	// \n\ => newline, tt
		345	// \n\n => \n\n
		346	// \n => single space
		347
		348	// two or more newlines will be copied verbatim, one is replaced by space
		349	if (*cfpod == '\n')
		350	{
		351	--cfpod;
		352	do
		353	buf << *cfpod++;
		354	while (*cfpod == '\n');
		355	}
		356	else if (*cfpod == ' ')
		357	buf << '\n';
		358	else
		359	buf << ' ';
		360
		361	// verbatim block?
		362	if (*cfpod == ' ')
		363	goto verbatim;
		364
		365	break;
		366
		367	case 'B': case 'C': case 'E': case 'G': case 'H':
		368	case 'I': case 'L': case 'T': case 'U': case 'Z':
		369	{
		370	int end = 0;
		371
		372	while (cfpod [end] == '<')
		373	++end;
		374
		375	if (!end)
		376	goto passthrough;
		377
		378	if (end == 1 \|\| cfpod [end] != ' ')
		379	{
		380	end = -1;
		381	++cfpod;
		382	}
		383	else
		384	cfpod += end + 1;
		385
		386	const char pfx, sfx;
		387
		388	switch (ch)
		389	{
		390	case 'B': pfx = "<b>" ; sfx = "</b>" ; break;
		391	case 'C': pfx = "<tt>" ; sfx = "</tt>" ; break;
		392	case 'E': pfx = "&" ; sfx = ";" ; break;
		393	case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
		394	case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
		395	case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
		396	case 'Z': pfx = "" ; sfx = "" ; break;
		397
		398	case 'L': // link, not really supported - always use first (or only) component
		399	{
		400	cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
		401	nest << '\0'; // zero-terminate
		402
		403	const char *str = nest.linearise ();
		404	const char *sep = strchr (str, '\|');
		405
		406	buf.add (str, sep ? sep - str : nest.size ());
		407
		408	nest.clear ();
		409
		410	goto skip;
		411	}
		412
		413	case 'H': // hint
		414	{
		415	if (hintmode)
		416	{
		417	cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
		418	nest.clear ();
		419
		420	if (hintmode == 1)
		421	buf << "<fg name=\"lightblue\">[Hint available]</fg>";
		422	else
		423	while (cfpod <= ' '&& cfpod) // eat trailing whitespace
		424	++cfpod;
		425
		426	goto skip;
		427	}
		428	else
		429	{
		430	pfx = "<fg name=\"lightblue\">[Hint: ";
		431	sfx = "]</fg>";
		432	}
		433	}
		434	break;
		435
		436	case 'G': // gender
		437	{
		438	cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
		439	nest << '\0'; // zero-terminate
		440
		441	const char *str = nest.linearise ();
		442	const char *sep = strchr (str, '\|');
		443
		444	if (sep)
		445	{
		446	if (gender)
		447	buf.add (sep + 1, nest.size () - (sep - str) - 2);
		448	else
		449	buf.add (str, sep - str);
		450	}
		451
		452	nest.clear ();
		453
		454	goto skip;
		455	}
		456
		457	default:
		458	pfx = "UNKNOWN_DIRECTIVE{";
		459	sfx = "}";
		460	break;
		461	}
		462
		463	buf << pfx;
		464	cfpod = expand_cfpod (hintmode, gender, buf, cfpod, end);
		465	buf << sfx;
		466	}
		467
		468	break;
		469
		470	default:
		471	passthrough:
		472	buf << ch;
		473	skip:
		474	break;
		475
		476	verbatim:
		477	// elements cannot currently span multiple lines
		478	do
		479	{
		480	buf << "<tt>";
		481	cfpod = expand_cfpod (hintmode, gender, buf, cfpod, -2);
		482	buf << "</tt>\n";
		483
		484	while (*cfpod == '\n')
		485	buf << *cfpod++;
		486	}
		487	while (*cfpod == ' ');
		488
		489	break;
		490	}
		491	}
		492
		493	dynbuf_text *
		494	player::expand_cfpod (int hintmode, int gender, const_utf8_string cfpod)
		495	{
		496	static dynbuf_text buf(65536, 1024);
		497	buf.clear ();
		498
		499	::expand_cfpod (hintmode, gender, buf, cfpod);
		500
		501	return &buf;
		502	}
		503
		504	dynbuf_text *
		505	player::expand_cfpod (const_utf8_string cfpod) const
		506	{
		507	return expand_cfpod (hintmode, gender, cfpod);
		508	}
		509

Diff Legend

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

Comparing deliantra/server/common/player.C (file contents): Revision 1.18 by root, Tue Jan 9 21:32:41 2007 UTC vs. Revision 1.73 by root, Wed Nov 21 12:59:44 2012 UTC

Diff Legend

Comparing deliantra/server/common/player.C (file contents):
Revision 1.18 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.73 by root, Wed Nov 21 12:59:44 2012 UTC