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.67 by root, Sun Apr 11 00:34:05 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 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.
… …
40 40
41 return 0; 41 return 0;
42} 42}
43 43
44/* 44/*
45 * returns true if the adressed object 'ob' is a player
46 * of the dragon race.
47 */
48int
49is_dragon_pl (const object *op)
50{
51 if (op
52 && op->type == PLAYER
53 && op->arch
54 && op->arch->race == shstr_dragon)
55 return 1;
56
57 return 0;
58}
59
60/*
61 * 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
62 */ 46 */
63bool 47bool
64player::save_pl (object_freezer &freezer) 48player::save_pl (object_freezer &freezer)
65{ 49{
… …
72 ob->container = 0; 56 ob->container = 0;
73 57
74 if (ob->map) 58 if (ob->map)
75 maplevel = ob->map->path; 59 maplevel = ob->map->path;
76 60
77#define PL_OUT(k) freezer.put (KW_ ## k, k) 61#define PL_OUT(k) freezer.put (KW(k), k)
78#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 62#define PL_OUT2(k,v) freezer.put (KW(k), v)
79 63
80 PL_OUT (password); 64 PL_OUT (password);
81 PL_OUT2 (title, own_title); 65 PL_OUT2 (title, own_title);
82 PL_OUT (gender); 66 PL_OUT (gender);
83 PL_OUT (hintmode); 67 PL_OUT (hintmode);
… …
90 PL_OUT (digestion); 74 PL_OUT (digestion);
91 PL_OUT2 (pickup, mode); 75 PL_OUT2 (pickup, mode);
92 PL_OUT (outputs_sync); 76 PL_OUT (outputs_sync);
93 PL_OUT (outputs_count); 77 PL_OUT (outputs_count);
94 78
95 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)));
96 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)));
97 81
98 PL_OUT2 (map, maplevel); 82 PL_OUT2 (map, maplevel);
99 PL_OUT (savebed_map); 83 PL_OUT (savebed_map);
100 PL_OUT (bed_x); 84 PL_OUT (bed_x);
101 PL_OUT (bed_y); 85 PL_OUT (bed_y);
102 PL_OUT (weapon_sp); 86 PL_OUT (weapon_sp);
103 PL_OUT (weapon_sp_left); 87 PL_OUT (weapon_sp_left);
104 PL_OUT2 (Str, orig_stats.Str); 88 PL_OUT2 (str, orig_stats.Str);
105 PL_OUT2 (Dex, orig_stats.Dex); 89 PL_OUT2 (dex, orig_stats.Dex);
106 PL_OUT2 (Con, orig_stats.Con); 90 PL_OUT2 (con, orig_stats.Con);
107 PL_OUT2 (Int, orig_stats.Int); 91 PL_OUT2 (int, orig_stats.Int);
108 PL_OUT2 (Pow, orig_stats.Pow); 92 PL_OUT2 (pow, orig_stats.Pow);
109 PL_OUT2 (Wis, orig_stats.Wis); 93 PL_OUT2 (wis, orig_stats.Wis);
110 PL_OUT2 (Cha, orig_stats.Cha); 94 PL_OUT2 (cha, orig_stats.Cha);
111 95
112 PL_OUT2 (lev_array, 10); 96 PL_OUT2 (lev_array, 10);
113 97
114 for (int i = 1; i <= 10; i++) 98 for (int i = 1; i <= 10; i++)
115 { 99 {
… …
117 freezer.add (levsp [i]); freezer.add ('\n'); 101 freezer.add (levsp [i]); freezer.add ('\n');
118 freezer.add (levgrace[i]); freezer.add ('\n'); 102 freezer.add (levgrace[i]); freezer.add ('\n');
119 } 103 }
120 104
121 freezer.put (ob->contr); 105 freezer.put (ob->contr);
122 freezer.put (KW_endplst); 106 freezer.put (KW(endplst));
123 107
124 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 108 ob->clr_flag (FLAG_WIZ);
125 CLEAR_FLAG (ob, FLAG_WIZ);
126 ob->write (freezer); 109 ob->write (freezer);
127
128 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
129 110
130 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 111 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
131 ob->container = container; 112 ob->container = container;
132 113
133 ob->flag [FLAG_WIZ] = wiz; 114 ob->flag [FLAG_WIZ] = wiz;
… …
191 return pl; 172 return pl;
192 173
193 case KW_oid: f.get (pl, f.get_sint32 ()); break; 174 case KW_oid: f.get (pl, f.get_sint32 ()); break;
194 case KW_password: assign (pl->password , f.get_str ()); break; 175 case KW_password: assign (pl->password , f.get_str ()); break;
195 case KW_title: assign (pl->own_title, f.get_str ()); break; 176 case KW_title: assign (pl->own_title, f.get_str ()); break;
196 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break; 177 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
197 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break; 178 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
198 case KW_gender: f.get (pl->gender); break; 179 case KW_gender: f.get (pl->gender); break;
199 case KW_hintmode: f.get (pl->hintmode); break; 180 case KW_hintmode: f.get (pl->hintmode); break;
200 case KW_listening: /*TODO*/; break; 181 case KW_listening: /*TODO*/; break;
201 case KW_peaceful: f.get (pl->peaceful); break; 182 case KW_peaceful: f.get (pl->peaceful); break;
202 case KW_digestion: f.get (pl->digestion); break; 183 case KW_digestion: f.get (pl->digestion); break;
… …
207 case KW_savebed_map: f.get (pl->savebed_map); break; 188 case KW_savebed_map: f.get (pl->savebed_map); break;
208 case KW_bed_x: f.get (pl->bed_x); break; 189 case KW_bed_x: f.get (pl->bed_x); break;
209 case KW_bed_y: f.get (pl->bed_y); break; 190 case KW_bed_y: f.get (pl->bed_y); break;
210 case KW_weapon_sp: f.get (pl->weapon_sp); break; 191 case KW_weapon_sp: f.get (pl->weapon_sp); break;
211 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
212 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
213 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
214 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
215 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
216 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
217 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
218 case KW_Cha: f.get (pl->orig_stats.Cha); break; 207 case KW_cha: f.get (pl->orig_stats.Cha); break;
208
219 case KW_gen_hp: f.get (pl->gen_hp); break; 209 case KW_gen_hp: f.get (pl->gen_hp); break;
220 case KW_gen_sp: f.get (pl->gen_sp); break; 210 case KW_gen_sp: f.get (pl->gen_sp); break;
221 case KW_gen_grace: f.get (pl->gen_grace); break; 211 case KW_gen_grace: f.get (pl->gen_grace); break;
222 212
223 case KW_usekeys: 213 case KW_usekeys:
… …
270 pl->destroy (); 260 pl->destroy ();
271 261
272 return 0; 262 return 0;
273} 263}
274 264
275const char * 265const_utf8_string
276player::killer_name () const 266player::killer_name () const
277{ 267{
278 static char buf [2048]; 268 static char buf [2048];
279 269
280 if (!killer) 270 if (!killer)

Diff Legend

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