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.58 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.62 by root, Sat Jan 16 13:41:37 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
… …
72 ob->container = 0; 72 ob->container = 0;
73 73
74 if (ob->map) 74 if (ob->map)
75 maplevel = ob->map->path; 75 maplevel = ob->map->path;
76 76
77#define PL_OUT(k) freezer.put (KW_ ## k, k) 77#define PL_OUT(k) freezer.put (KW(k), k)
78#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 78#define PL_OUT2(k,v) freezer.put (KW(k), v)
79 79
80 PL_OUT (password); 80 PL_OUT (password);
81 PL_OUT2 (title, own_title); 81 PL_OUT2 (title, own_title);
82 PL_OUT (gender); 82 PL_OUT (gender);
83 PL_OUT (hintmode); 83 PL_OUT (hintmode);
… …
90 PL_OUT (digestion); 90 PL_OUT (digestion);
91 PL_OUT2 (pickup, mode); 91 PL_OUT2 (pickup, mode);
92 PL_OUT (outputs_sync); 92 PL_OUT (outputs_sync);
93 PL_OUT (outputs_count); 93 PL_OUT (outputs_count);
94 94
95 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 95 freezer.put (KW(usekeys), usekeys == key_inventory ? CS(key_inventory) : (usekeys == keyrings ? CS(keyrings) : CS(containers)));
96 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 96 freezer.put (KW(unapply), unapply == unapply_nochoice ? CS(unapply_nochoice) : (unapply == unapply_never ? CS(unapply_never) : CS(unapply_always)));
97 97
98 PL_OUT2 (map, maplevel); 98 PL_OUT2 (map, maplevel);
99 PL_OUT (savebed_map); 99 PL_OUT (savebed_map);
100 PL_OUT (bed_x); 100 PL_OUT (bed_x);
101 PL_OUT (bed_y); 101 PL_OUT (bed_y);
… …
117 freezer.add (levsp [i]); freezer.add ('\n'); 117 freezer.add (levsp [i]); freezer.add ('\n');
118 freezer.add (levgrace[i]); freezer.add ('\n'); 118 freezer.add (levgrace[i]); freezer.add ('\n');
119 } 119 }
120 120
121 freezer.put (ob->contr); 121 freezer.put (ob->contr);
122 freezer.put (KW_endplst); 122 freezer.put (KW(endplst));
123 123
124 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
125 CLEAR_FLAG (ob, FLAG_WIZ); 124 CLEAR_FLAG (ob, FLAG_WIZ);
126 ob->write (freezer); 125 ob->write (freezer);
127
128 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
129 126
130 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 127 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
131 ob->container = container; 128 ob->container = container;
132 129
133 ob->flag [FLAG_WIZ] = wiz; 130 ob->flag [FLAG_WIZ] = wiz;
… …
270 pl->destroy (); 267 pl->destroy ();
271 268
272 return 0; 269 return 0;
273} 270}
274 271
275const char * 272const_utf8_string
276player::killer_name () const 273player::killer_name () const
277{ 274{
278 static char buf [2048]; 275 static char buf [2048];
279 276
280 if (!killer) 277 if (!killer)

Diff Legend

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