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.63 by root, Sat Jan 30 23:30:26 2010 UTC vs.
Revision 1.74 by root, Wed Nov 21 13:06:10 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,2010 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26 26
… …
83 PL_OUT (savebed_map); 83 PL_OUT (savebed_map);
84 PL_OUT (bed_x); 84 PL_OUT (bed_x);
85 PL_OUT (bed_y); 85 PL_OUT (bed_y);
86 PL_OUT (weapon_sp); 86 PL_OUT (weapon_sp);
87 PL_OUT (weapon_sp_left); 87 PL_OUT (weapon_sp_left);
88 PL_OUT2 (Str, orig_stats.Str); 88 PL_OUT2 (str, orig_stats.Str);
89 PL_OUT2 (Dex, orig_stats.Dex); 89 PL_OUT2 (dex, orig_stats.Dex);
90 PL_OUT2 (Con, orig_stats.Con); 90 PL_OUT2 (con, orig_stats.Con);
91 PL_OUT2 (Int, orig_stats.Int); 91 PL_OUT2 (int, orig_stats.Int);
92 PL_OUT2 (Pow, orig_stats.Pow); 92 PL_OUT2 (pow, orig_stats.Pow);
93 PL_OUT2 (Wis, orig_stats.Wis); 93 PL_OUT2 (wis, orig_stats.Wis);
94 PL_OUT2 (Cha, orig_stats.Cha); 94 PL_OUT2 (cha, orig_stats.Cha);
95 95
96 PL_OUT2 (lev_array, 10); 96 PL_OUT2 (lev_array, 10);
97 97
98 for (int i = 1; i <= 10; i++) 98 for (int i = 1; i <= 10; i++)
99 { 99 {
… …
103 } 103 }
104 104
105 freezer.put (ob->contr); 105 freezer.put (ob->contr);
106 freezer.put (KW(endplst)); 106 freezer.put (KW(endplst));
107 107
108 CLEAR_FLAG (ob, FLAG_WIZ); 108 ob->clr_flag (FLAG_WIZ);
109 ob->write (freezer); 109 ob->write (freezer);
110 110
111 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 111 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
112 ob->container = container; 112 ob->container = container;
113 113
… …
172 return pl; 172 return pl;
173 173
174 case KW_oid: f.get (pl, f.get_sint32 ()); break; 174 case KW_oid: f.get (pl, f.get_sint32 ()); break;
175 case KW_password: assign (pl->password , f.get_str ()); break; 175 case KW_password: assign (pl->password , f.get_str ()); break;
176 case KW_title: assign (pl->own_title, f.get_str ()); break; 176 case KW_title: assign (pl->own_title, f.get_str ()); break;
177 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; 177 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
178 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; 178 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
179 case KW_gender: f.get (pl->gender); break; 179 case KW_gender: f.get (pl->gender); break;
180 case KW_hintmode: f.get (pl->hintmode); break; 180 case KW_hintmode: f.get (pl->hintmode); break;
181 case KW_listening: /*TODO*/; break; 181 case KW_listening: /*TODO*/; break;
182 case KW_peaceful: f.get (pl->peaceful); break; 182 case KW_peaceful: f.get (pl->peaceful); break;
183 case KW_digestion: f.get (pl->digestion); break; 183 case KW_digestion: f.get (pl->digestion); break;
… …
188 case KW_savebed_map: f.get (pl->savebed_map); break; 188 case KW_savebed_map: f.get (pl->savebed_map); break;
189 case KW_bed_x: f.get (pl->bed_x); break; 189 case KW_bed_x: f.get (pl->bed_x); break;
190 case KW_bed_y: f.get (pl->bed_y); break; 190 case KW_bed_y: f.get (pl->bed_y); break;
191 case KW_weapon_sp: f.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; 192 case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
193
194 case KW_Str: // uppercase alias
193 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
194 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
195 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
196 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
197 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
198 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
199 case KW_Cha: f.get (pl->orig_stats.Cha); break; 207 case KW_cha: f.get (pl->orig_stats.Cha); break;
208
200 case KW_gen_hp: f.get (pl->gen_hp); break; 209 case KW_gen_hp: f.get (pl->gen_hp); break;
201 case KW_gen_sp: f.get (pl->gen_sp); break; 210 case KW_gen_sp: f.get (pl->gen_sp); break;
202 case KW_gen_grace: f.get (pl->gen_grace); break; 211 case KW_gen_grace: f.get (pl->gen_grace); break;
203 212
204 case KW_usekeys: 213 case KW_usekeys:
… …
227 { 236 {
228 int count = f.get_sint32 (); 237 int count = f.get_sint32 ();
229 238
230 for (int i = 1; i <= count; i++) 239 for (int i = 1; i <= count; i++)
231 { 240 {
232 char line [32]; 241 f.next_line (); f.get (pl->levhp [i]);
233 242 f.next_line (); f.get (pl->levsp [i]);
234 fgets (line, 32, f); pl->levhp [i] = atoi (line); 243 f.next_line (); f.get (pl->levgrace[i]);
235 fgets (line, 32, f); pl->levsp [i] = atoi (line);
236 fgets (line, 32, f); pl->levgrace[i] = atoi (line);
237 } 244 }
238 } 245 }
239 break; 246 break;
240 } 247 }
241 248
… …
276// expand one level of cfpod 283// expand one level of cfpod
277// end == -2, till '\n' 284// end == -2, till '\n'
278// end == -1, till '>' 285// end == -1, till '>'
279// end == 0, till eos 286// end == 0, till eos
280// end >= 1, levels of " >>>" 287// end >= 1, levels of " >>>"
288// pod sequences not handled: F, S, X
281static const char * 289static const char *
282expand_cfpod (const player *pl, dynbuf_text &buf, const char *cfpod, int end = 0) 290expand_cfpod (int hintmode, int gender, dynbuf_text &buf, const char *cfpod, int end = 0)
283{ 291{
284 static dynbuf_text nest(128, 128); 292 static dynbuf_text nest(128, 128);
285 293
286 for (;;) 294 for (;;)
287 switch (char ch = *cfpod++) 295 switch (char ch = *cfpod++)
… …
355 if (*cfpod == ' ') 363 if (*cfpod == ' ')
356 goto verbatim; 364 goto verbatim;
357 365
358 break; 366 break;
359 367
360 case 'B': case 'C': case 'E': case 'G': 368 case 'B': case 'C': case 'E': case 'G': case 'H':
361 case 'H': case 'I': case 'T': case 'U': 369 case 'I': case 'L': case 'T': case 'U': case 'Z':
362 case 'Z':
363 { 370 {
364 int end = 0; 371 int end = 0;
365 372
366 while (cfpod [end] == '<') 373 while (cfpod [end] == '<')
367 ++end; 374 ++end;
… …
387 case 'I': pfx = "<i>" ; sfx = "</i>" ; break; 394 case 'I': pfx = "<i>" ; sfx = "</i>" ; break;
388 case 'U': pfx = "<u>" ; sfx = "</u>" ; break; 395 case 'U': pfx = "<u>" ; sfx = "</u>" ; break;
389 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break; 396 case 'T': pfx = "<big><b>"; sfx = "</b></big>"; break;
390 case 'Z': pfx = "" ; sfx = "" ; break; 397 case 'Z': pfx = "" ; sfx = "" ; break;
391 398
399 case 'L': // link, not really supported - always use first (or only) component
400 {
401 cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
402 nest << '\0'; // zero-terminate
403
404 const char *str = nest.linearise ();
405 const char *sep = strchr (str, '|');
406
407 buf.add (str, sep ? sep - str : nest.size ());
408
409 nest.clear ();
410
411 goto skip;
412 }
413
392 case 'H': // hint 414 case 'H': // hint
393 { 415 {
394 if (pl->hintmode) 416 if (hintmode)
395 { 417 {
396 cfpod = expand_cfpod (pl, nest, cfpod, end); 418 cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
397 nest.clear (); 419 nest.clear ();
398 420
399 if (pl->hintmode == 1) 421 if (hintmode == 1)
400 buf << "<fg name=\"lightblue\">[Hint available]</fg>"; 422 buf << "<fg name=\"lightblue\">[Hint available]</fg>";
401 else 423 else
402 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace 424 while (*cfpod <= ' '&& *cfpod) // eat trailing whitespace
403 ++cfpod; 425 ++cfpod;
404 426
… …
412 } 434 }
413 break; 435 break;
414 436
415 case 'G': // gender 437 case 'G': // gender
416 { 438 {
417 cfpod = expand_cfpod (pl, nest, cfpod, end); 439 cfpod = expand_cfpod (hintmode, gender, nest, cfpod, end);
418 nest << '\0'; // zero-terminate 440 nest << '\0'; // zero-terminate
419 441
420 const char *str = nest.linearise (); 442 const char *str = nest.linearise ();
421 const char *sep = strchr (str, '|'); 443 const char *sep = strchr (str, '|');
422 444
423 if (sep) 445 if (sep)
424 { 446 {
425 if (pl->gender) 447 if (gender)
426 buf.add (sep + 1, nest.size () - (sep - str) - 2); 448 buf.add (sep + 1, nest.size () - (sep - str) - 2);
427 else 449 else
428 buf.add (str, sep - str); 450 buf.add (str, sep - str);
429 } 451 }
430 452
… …
438 sfx = "}"; 460 sfx = "}";
439 break; 461 break;
440 } 462 }
441 463
442 buf << pfx; 464 buf << pfx;
443 cfpod = expand_cfpod (pl, buf, cfpod, end); 465 cfpod = expand_cfpod (hintmode, gender, buf, cfpod, end);
444 buf << sfx; 466 buf << sfx;
445 } 467 }
446 468
447 break; 469 break;
448 470
… …
455 verbatim: 477 verbatim:
456 // elements cannot currently span multiple lines 478 // elements cannot currently span multiple lines
457 do 479 do
458 { 480 {
459 buf << "<tt>"; 481 buf << "<tt>";
460 cfpod = expand_cfpod (pl, buf, cfpod, -2); 482 cfpod = expand_cfpod (hintmode, gender, buf, cfpod, -2);
461 buf << "</tt>\n"; 483 buf << "</tt>\n";
462 484
463 while (*cfpod == '\n') 485 while (*cfpod == '\n')
464 buf << *cfpod++; 486 buf << *cfpod++;
465 } 487 }
… …
468 break; 490 break;
469 } 491 }
470} 492}
471 493
472dynbuf_text * 494dynbuf_text *
473player::expand_cfpod (const char *cfpod) const 495player::expand_cfpod (int hintmode, int gender, const_utf8_string cfpod)
474{ 496{
475 static dynbuf_text buf(1024, 1024); 497 static dynbuf_text buf(65536, 1024);
476 buf.clear (); 498 buf.clear ();
477 499
478 ::expand_cfpod (this, buf, cfpod); 500 ::expand_cfpod (hintmode, gender, buf, cfpod);
479 501
480 return &buf; 502 return &buf;
481} 503}
482 504
505dynbuf_text *
506player::expand_cfpod (const_utf8_string cfpod) const
507{
508 return expand_cfpod (hintmode, gender, cfpod);
509}
510

Diff Legend

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