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

Comparing deliantra/server/common/player.C (file contents):
Revision 1.54 by root, Thu Sep 17 00:10:03 2009 UTC vs.
Revision 1.73 by root, Wed Nov 21 12:59:44 2012 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
		26
		27	//+GPL
25		28
26	/* Determine if the attacktype represented by the	29	/* Determine if the attacktype represented by the
27	* specified attack-number is enabled for dragon players.	30	* specified attack-number is enabled for dragon players.
28	* A dragon player (quetzal) can gain resistances for	31	* A dragon player (quetzal) can gain resistances for
29	* all enabled attacktypes.	32	* all enabled attacktypes.
37		40
38	return 0;	41	return 0;
39	}	42	}
40		43
41	/*	44	/*
42	* returns true if the adressed object 'ob' is a player
43	* of the dragon race.
44	*/
45	int
46	is_dragon_pl (const object *op)
47	{
48	if (op
49	&& op->type == PLAYER
50	&& op->arch
51	&& op->arch->race == shstr_dragon)
52	return 1;
53
54	return 0;
55	}
56
57	/*
58	* 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
59	*/	46	*/
60	bool	47	bool
61	player::save_pl (object_freezer &freezer)	48	player::save_pl (object_freezer &freezer)
62	{	49	{
63	INVOKE_PLAYER (SAVE, ob->contr);	50	INVOKE_PLAYER (SAVE, ob->contr);
64		51
65	int wiz = ob->flag [FLAG_WIZ];	52	int wiz = ob->flag [FLAG_WIZ];
66		53
67	/* 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. */
68	object *container = ob->container;	55	object *container = ob->container_ ();
69	ob->container = 0;	56	ob->container = 0;
70		57
71	if (ob->map)	58	if (ob->map)
72	maplevel = ob->map->path;	59	maplevel = ob->map->path;
73		60
74	#define PL_OUT(k) freezer.put (KW_ ## k, k)	61	#define PL_OUT(k) freezer.put (KW(k), k)
75	#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)	62	#define PL_OUT2(k,v) freezer.put (KW(k), v)
76		63
77	PL_OUT (password);	64	PL_OUT (password);
78	PL_OUT2 (title, own_title);	65	PL_OUT2 (title, own_title);
79	PL_OUT (gender);	66	PL_OUT (gender);
80	PL_OUT (hintmode);	67	PL_OUT (hintmode);
…		…
87	PL_OUT (digestion);	74	PL_OUT (digestion);
88	PL_OUT2 (pickup, mode);	75	PL_OUT2 (pickup, mode);
89	PL_OUT (outputs_sync);	76	PL_OUT (outputs_sync);
90	PL_OUT (outputs_count);	77	PL_OUT (outputs_count);
91		78
92	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)));
93	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)));
94		81
95	PL_OUT2 (map, maplevel);	82	PL_OUT2 (map, maplevel);
96	PL_OUT (savebed_map);	83	PL_OUT (savebed_map);
97	PL_OUT (bed_x);	84	PL_OUT (bed_x);
98	PL_OUT (bed_y);	85	PL_OUT (bed_y);
99	PL_OUT (weapon_sp);	86	PL_OUT (weapon_sp);
100	PL_OUT (weapon_sp_left);	87	PL_OUT (weapon_sp_left);
101	PL_OUT2 (Str, orig_stats.Str);	88	PL_OUT2 (str, orig_stats.Str);
102	PL_OUT2 (Dex, orig_stats.Dex);	89	PL_OUT2 (dex, orig_stats.Dex);
103	PL_OUT2 (Con, orig_stats.Con);	90	PL_OUT2 (con, orig_stats.Con);
104	PL_OUT2 (Int, orig_stats.Int);	91	PL_OUT2 (int, orig_stats.Int);
105	PL_OUT2 (Pow, orig_stats.Pow);	92	PL_OUT2 (pow, orig_stats.Pow);
106	PL_OUT2 (Wis, orig_stats.Wis);	93	PL_OUT2 (wis, orig_stats.Wis);
107	PL_OUT2 (Cha, orig_stats.Cha);	94	PL_OUT2 (cha, orig_stats.Cha);
108		95
109	PL_OUT2 (lev_array, 10);	96	PL_OUT2 (lev_array, 10);
110		97
111	for (int i = 1; i <= 10; i++)	98	for (int i = 1; i <= 10; i++)
112	{	99	{
…		…
114	freezer.add (levsp [i]); freezer.add ('\n');	101	freezer.add (levsp [i]); freezer.add ('\n');
115	freezer.add (levgrace[i]); freezer.add ('\n');	102	freezer.add (levgrace[i]); freezer.add ('\n');
116	}	103	}
117		104
118	freezer.put (ob->contr);	105	freezer.put (ob->contr);
119	freezer.put (KW_endplst);	106	freezer.put (KW(endplst));
120		107
121	SET_FLAG (ob, FLAG_NO_FIX_PLAYER);	108	ob->clr_flag (FLAG_WIZ);
122	CLEAR_FLAG (ob, FLAG_WIZ);
123	ob->write (freezer);	109	ob->write (freezer);
124
125	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
126		110
127	/* Eneq(@csd.uu.se): Reveal the container if we have one. */	111	/* Eneq(@csd.uu.se): Reveal the container if we have one. */
128	ob->container = container;	112	ob->container = container;
129		113
130	ob->flag [FLAG_WIZ] = wiz;	114	ob->flag [FLAG_WIZ] = wiz;
131		115
132	INVOKE_PLAYER (SAVE_DONE, ob->contr);	116	INVOKE_PLAYER (SAVE_DONE, ob->contr);
133		117
134	return true;	118	return true;
135	}	119	}
		120
		121	//-GPL
136		122
137	bool	123	bool
138	player::save_pl (const char *path)	124	player::save_pl (const char *path)
139	{	125	{
140	object_freezer freezer;	126	object_freezer freezer;
…		…
186	return pl;	172	return pl;
187		173
188	case KW_oid: f.get (pl, f.get_sint32 ()); break;	174	case KW_oid: f.get (pl, f.get_sint32 ()); break;
189	case KW_password: assign (pl->password , f.get_str ()); break;	175	case KW_password: assign (pl->password , f.get_str ()); break;
190	case KW_title: assign (pl->own_title, f.get_str ()); break;	176	case KW_title: assign (pl->own_title, f.get_str ()); break;
191	case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;	177	case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
192	case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;	178	case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
193	case KW_gender: f.get (pl->gender); break;	179	case KW_gender: f.get (pl->gender); break;
194	case KW_hintmode: f.get (pl->hintmode); break;	180	case KW_hintmode: f.get (pl->hintmode); break;
195	case KW_listening: /TODO/; break;	181	case KW_listening: /TODO/; break;
196	case KW_peaceful: f.get (pl->peaceful); break;	182	case KW_peaceful: f.get (pl->peaceful); break;
197	case KW_digestion: f.get (pl->digestion); break;	183	case KW_digestion: f.get (pl->digestion); break;
…		…
202	case KW_savebed_map: f.get (pl->savebed_map); break;	188	case KW_savebed_map: f.get (pl->savebed_map); break;
203	case KW_bed_x: f.get (pl->bed_x); break;	189	case KW_bed_x: f.get (pl->bed_x); break;
204	case KW_bed_y: f.get (pl->bed_y); break;	190	case KW_bed_y: f.get (pl->bed_y); break;
205	case KW_weapon_sp: f.get (pl->weapon_sp); break;	191	case KW_weapon_sp: f.get (pl->weapon_sp); break;
206	case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;	192	case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
		193
		194	case KW_Str: // uppercase alias
207	case KW_Str: f.get (pl->orig_stats.Str); break;	195	case KW_str: f.get (pl->orig_stats.Str); break;
		196	case KW_Dex: // uppercase alias
208	case KW_Dex: f.get (pl->orig_stats.Dex); break;	197	case KW_dex: f.get (pl->orig_stats.Dex); break;
		198	case KW_Con: // uppercase alias
209	case KW_Con: f.get (pl->orig_stats.Con); break;	199	case KW_con: f.get (pl->orig_stats.Con); break;
		200	case KW_Int: // uppercase alias
210	case KW_Int: f.get (pl->orig_stats.Int); break;	201	case KW_int: f.get (pl->orig_stats.Int); break;
		202	case KW_Pow: // uppercase alias
211	case KW_Pow: f.get (pl->orig_stats.Pow); break;	203	case KW_pow: f.get (pl->orig_stats.Pow); break;
		204	case KW_Wis: // uppercase alias
212	case KW_Wis: f.get (pl->orig_stats.Wis); break;	205	case KW_wis: f.get (pl->orig_stats.Wis); break;
		206	case KW_Cha: // uppercase alias
213	case KW_Cha: f.get (pl->orig_stats.Cha); break;	207	case KW_cha: f.get (pl->orig_stats.Cha); break;
		208
214	case KW_gen_hp: f.get (pl->gen_hp); break;	209	case KW_gen_hp: f.get (pl->gen_hp); break;
215	case KW_gen_sp: f.get (pl->gen_sp); break;	210	case KW_gen_sp: f.get (pl->gen_sp); break;
216	case KW_gen_grace: f.get (pl->gen_grace); break;	211	case KW_gen_grace: f.get (pl->gen_grace); break;
217		212
218	case KW_usekeys:	213	case KW_usekeys:
…		…
241	{	236	{
242	int count = f.get_sint32 ();	237	int count = f.get_sint32 ();
243		238
244	for (int i = 1; i <= count; i++)	239	for (int i = 1; i <= count; i++)
245	{	240	{
246	char line [32];	241	f.next_line (); f.get (pl->levhp [i]);
247		242	f.next_line (); f.get (pl->levsp [i]);
248	fgets (line, 32, f); pl->levhp [i] = atoi (line);	243	f.next_line (); f.get (pl->levgrace[i]);
249	fgets (line, 32, f); pl->levsp [i] = atoi (line);
250	fgets (line, 32, f); pl->levgrace[i] = atoi (line);
251	}	244	}
252	}	245	}
253	break;	246	break;
254	}	247	}
255		248
…		…
265	pl->destroy ();	258	pl->destroy ();
266		259
267	return 0;	260	return 0;
268	}	261	}
269		262
270	const char *	263	const_utf8_string
271	player::killer_name () const	264	player::killer_name () const
272	{	265	{
273	static char buf [2048];	266	static char buf [2048];
274		267
275	if (!killer)	268	if (!killer)
…		…
291	// end == -2, till '\n'	284	// end == -2, till '\n'
292	// end == -1, till '>'	285	// end == -1, till '>'
293	// end == 0, till eos	286	// end == 0, till eos
294	// end >= 1, levels of " >>>"	287	// end >= 1, levels of " >>>"
295	static const char *	288	static const char *
296	expand_cfpod (const player pl, dynbuf_text &buf, const char cfpod, int end = 0)	289	expand_cfpod (int hintmode, int gender, dynbuf_text &buf, const char *cfpod, int end = 0)
297	{	290	{
298	static dynbuf_text nest(128, 128);	291	static dynbuf_text nest(128, 128);
299		292
300	for (;;)	293	for (;;)
301	switch (char ch = *cfpod++)	294	switch (char ch = *cfpod++)
…		…
369	if (*cfpod == ' ')	362	if (*cfpod == ' ')
370	goto verbatim;	363	goto verbatim;
371		364
372	break;	365	break;
373		366
374	case 'B': case 'C': case 'E': case 'G':	367	case 'B': case 'C': case 'E': case 'G': case 'H':
375	case 'H': case 'I': case 'T': case 'U':	368	case 'I': case 'L': case 'T': case 'U': case 'Z':
376	case 'Z':
377	{	369	{
378	int end = 0;	370	int end = 0;
379		371
380	while (cfpod [end] == '<')	372	while (cfpod [end] == '<')
381	++end;	373	++end;
…		…
401	case 'I': pfx = "<i>" ; sfx = "</i>" ; break;	393	case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
402	case 'U': pfx = "<u>" ; sfx = "</u>" ; break;	394	case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
403	case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;	395	case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
404	case 'Z': pfx = "" ; sfx = "" ; break;	396	case 'Z': pfx = "" ; sfx = "" ; break;
405		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
406	case 'H': // hint	413	case 'H': // hint
407	{	414	{
408	if (pl->hintmode)	415	if (hintmode)
409	{	416	{
410	cfpod = expand_cfpod (pl, nest, cfpod, end);	417	cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
411	nest.clear ();	418	nest.clear ();
412		419
413	if (pl->hintmode == 1)	420	if (hintmode == 1)
414	buf << "<fg name=\"lightblue\">[Hint available]</fg>";	421	buf << "<fg name=\"lightblue\">[Hint available]</fg>";
415	else	422	else
416	while (cfpod <= ' '&& cfpod) // eat trailing whitespace	423	while (cfpod <= ' '&& cfpod) // eat trailing whitespace
417	++cfpod;	424	++cfpod;
418		425
…		…
426	}	433	}
427	break;	434	break;
428		435
429	case 'G': // gender	436	case 'G': // gender
430	{	437	{
431	cfpod = expand_cfpod (pl, nest, cfpod, end);	438	cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
432	nest << '\0'; // zero-terminate	439	nest << '\0'; // zero-terminate
433		440
434	const char *str = nest.linearise ();	441	const char *str = nest.linearise ();
435	const char *sep = strchr (str, '\|');	442	const char *sep = strchr (str, '\|');
436		443
437	if (sep)	444	if (sep)
438	{	445	{
439	if (pl->gender)	446	if (gender)
440	buf.add (sep + 1, nest.size () - (sep - str) - 2);	447	buf.add (sep + 1, nest.size () - (sep - str) - 2);
441	else	448	else
442	buf.add (str, sep - str);	449	buf.add (str, sep - str);
443	}	450	}
444		451
445	nest.clear ();	452	nest.clear ();
446		453
447	goto skip;	454	goto skip;
448	}	455	}
		456
		457	default:
		458	pfx = "UNKNOWN_DIRECTIVE{";
		459	sfx = "}";
		460	break;
449	}	461	}
450		462
451	buf << pfx;	463	buf << pfx;
452	cfpod = expand_cfpod (pl, buf, cfpod, end);	464	cfpod = expand_cfpod (hintmode, gender, buf, cfpod, end);
453	buf << sfx;	465	buf << sfx;
454	}	466	}
455		467
456	break;	468	break;
457		469
…		…
464	verbatim:	476	verbatim:
465	// elements cannot currently span multiple lines	477	// elements cannot currently span multiple lines
466	do	478	do
467	{	479	{
468	buf << "<tt>";	480	buf << "<tt>";
469	cfpod = expand_cfpod (pl, buf, cfpod, -2);	481	cfpod = expand_cfpod (hintmode, gender, buf, cfpod, -2);
470	buf << "</tt>\n";	482	buf << "</tt>\n";
471		483
472	while (*cfpod == '\n')	484	while (*cfpod == '\n')
473	buf << *cfpod++;	485	buf << *cfpod++;
474	}	486	}
…		…
477	break;	489	break;
478	}	490	}
479	}	491	}
480		492
481	dynbuf_text *	493	dynbuf_text *
482	player::expand_cfpod (const char *cfpod) const	494	player::expand_cfpod (int hintmode, int gender, const_utf8_string cfpod)
483	{	495	{
484	static dynbuf_text buf(1024, 1024);	496	static dynbuf_text buf(65536, 1024);
485	buf.clear ();	497	buf.clear ();
486		498
487	::expand_cfpod (this, buf, cfpod);	499	::expand_cfpod (hintmode, gender, buf, cfpod);
488		500
489	return &buf;	501	return &buf;
490	}	502	}
491		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.54 by root, Thu Sep 17 00:10:03 2009 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.54 by root, Thu Sep 17 00:10:03 2009 UTC vs.
Revision 1.73 by root, Wed Nov 21 12:59:44 2012 UTC