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.17 by root, Tue Jan 9 01:28:32 2007 UTC vs.
Revision 1.35 by root, Thu Nov 8 19:43:23 2007 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
… …
45 * of the dragon race. 44 * of the dragon race.
46 */ 45 */
47int 46int
48is_dragon_pl (const object *op) 47is_dragon_pl (const object *op)
49{ 48{
50 if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0) 49 if (op
50 && op->type == PLAYER
51 && op->arch
52 && op->arch->race
53 && !strcmp (op->arch->race, "dragon"))
51 return 1; 54 return 1;
55
52 return 0; 56 return 0;
53} 57}
54 58
55/* 59/*
56 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory 60 * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
… …
64 68
65 /* Eneq(@csd.uu.se): If we have an open container hide it. */ 69 /* Eneq(@csd.uu.se): If we have an open container hide it. */
66 object *container = ob->container; 70 object *container = ob->container;
67 ob->container = 0; 71 ob->container = 0;
68 72
73 if (ob->map)
74 maplevel = ob->map->path;
75
69#define PL_OUT(k) freezer.put (KW_ ## k, k) 76#define PL_OUT(k) freezer.put (KW_ ## k, k)
70#define PL_OUT2(k,v) freezer.put (KW_ ## k, v) 77#define PL_OUT2(k,v) freezer.put (KW_ ## k, v)
71 78
72 PL_OUT (password); 79 PL_OUT (password);
73 PL_OUT2 (title, own_title); 80 PL_OUT2 (title, own_title);
81 PL_OUT (gender);
74 PL_OUT (gen_hp); 82 PL_OUT (gen_hp);
75 PL_OUT (gen_sp); 83 PL_OUT (gen_sp);
76 PL_OUT (gen_grace); 84 PL_OUT (gen_grace);
77 PL_OUT (listening); 85 PL_OUT (listening);
78 PL_OUT (shoottype);
79 PL_OUT (bowtype); 86 PL_OUT (bowtype);
80 PL_OUT (petmode); 87 PL_OUT (petmode);
81 PL_OUT (peaceful); 88 PL_OUT (peaceful);
82 PL_OUT (digestion); 89 PL_OUT (digestion);
83 PL_OUT2 (pickup, mode); 90 PL_OUT2 (pickup, mode);
84 PL_OUT (outputs_sync); 91 PL_OUT (outputs_sync);
85 PL_OUT (outputs_count); 92 PL_OUT (outputs_count);
86 93
87 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers")); 94 freezer.put (KW_usekeys, usekeys == key_inventory ? "key_inventory" : (usekeys == keyrings ? "keyrings" : "containers"));
88 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always")); 95 freezer.put (KW_unapply, unapply == unapply_nochoice ? "unapply_nochoice" : (unapply == unapply_never ? "unapply_never" : "unapply_always"));
89 96
90 PL_OUT2 (map, maplevel); 97 PL_OUT2 (map, maplevel);
91 PL_OUT (savebed_map); 98 PL_OUT (savebed_map);
92 PL_OUT (bed_x); 99 PL_OUT (bed_x);
93 PL_OUT (bed_y); 100 PL_OUT (bed_y);
94 PL_OUT (weapon_sp); 101 PL_OUT (weapon_sp);
102 PL_OUT (weapon_sp_left);
95 PL_OUT2 (Str, orig_stats.Str); 103 PL_OUT2 (Str, orig_stats.Str);
96 PL_OUT2 (Dex, orig_stats.Dex); 104 PL_OUT2 (Dex, orig_stats.Dex);
97 PL_OUT2 (Con, orig_stats.Con); 105 PL_OUT2 (Con, orig_stats.Con);
98 PL_OUT2 (Int, orig_stats.Int); 106 PL_OUT2 (Int, orig_stats.Int);
99 PL_OUT2 (Pow, orig_stats.Pow); 107 PL_OUT2 (Pow, orig_stats.Pow);
… …
102 110
103 PL_OUT2 (lev_array, 10); 111 PL_OUT2 (lev_array, 10);
104 112
105 for (int i = 1; i <= 10; i++) 113 for (int i = 1; i <= 10; i++)
106 { 114 {
107 fprintf (freezer, "%d\n", levhp [i]); 115 freezer.add (levhp [i]); freezer.add ('\n');
108 fprintf (freezer, "%d\n", levsp [i]); 116 freezer.add (levsp [i]); freezer.add ('\n');
109 fprintf (freezer, "%d\n", levgrace[i]); 117 freezer.add (levgrace[i]); freezer.add ('\n');
110 } 118 }
111 119
112 freezer.put (ob->contr); 120 freezer.put (ob->contr);
113 freezer.put (KW_endplst); 121 freezer.put (KW_endplst);
114 122
115 SET_FLAG (ob, FLAG_NO_FIX_PLAYER); 123 SET_FLAG (ob, FLAG_NO_FIX_PLAYER);
116 CLEAR_FLAG (ob, FLAG_WIZ); 124 CLEAR_FLAG (ob, FLAG_WIZ);
117 save_object (freezer, ob, 1); /* don't check and don't remove */ 125 ob->write (freezer);
118 126
119 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 127 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
120 128
121 /* Eneq(@csd.uu.se): Reveal the container if we have one. */ 129 /* Eneq(@csd.uu.se): Reveal the container if we have one. */
122 ob->container = container; 130 ob->container = container;
… …
138 146
139 return freezer.save (path); 147 return freezer.save (path);
140} 148}
141 149
142player * 150player *
143player::load_pl (object_thawer &thawer) 151player::load_pl (object_thawer &f)
144{ 152{
153 int maxerrs = 20;
154
145 player *pl = new player; 155 player *pl = new player;
146 156
147 pl->savebed_map = first_map_path; 157 pl->savebed_map = first_map_path;
148
149 /* this loads the standard objects values. */
150 pl->set_object (object::create ());
151 158
152 /* Loop through the file, loading the rest of the values */ 159 /* Loop through the file, loading the rest of the values */
153 for (;;) 160 for (;;)
154 { 161 {
155 keyword kw = thawer.get_kv ();
156
157 switch (kw) 162 switch (f.kw)
158 { 163 {
159 case KW_EOF: 164 case KW_EOF:
160 LOG (llevError, "%s: unexpected EOF while reading player header\n", thawer.name); 165 LOG (llevError, "%s: unexpected EOF while reading player header\n", f.name);
161 pl->ob->destroy (); 166 goto failure;
162 pl->destroy (); 167
168 default:
169 LOG (llevError, "%s: skipping unknown key in player header: %s\n", f.name, f.kw_str);
170 if (!--maxerrs) goto failure;
163 return 0; 171 break;
164 172
165 case KW_ERROR: 173 case KW_ERROR:
166 LOG (llevError, "%s: error while reading player header, skipping (%s,%s)\n", thawer.name, thawer.last_keyword, thawer.last_value); 174 LOG (llevError, "%s: parse error while reading player header, skipping (%s,%s).\n", f.name, f.kw_str, f.value);
175 if (!--maxerrs) goto failure;
167 break; 176 break;
168 177
169 case KW_endplst: 178 case KW_endplst:
179 f.next ();
180
181 if (object *op = pl->ob->read (f))
182 pl->set_object (op);
183 else
170 goto done; 184 goto failure;
171 185
186 INVOKE_PLAYER (LOAD, pl);
187
188 return pl;
189
172 case KW_oid: thawer.get (pl, thawer.get_sint32 ()); break; 190 case KW_oid: f.get (pl, f.get_sint32 ()); break;
173 case KW_password: assign (pl->password , thawer.get_str ()); break; 191 case KW_password: assign (pl->password , f.get_str ()); break;
174 case KW_title: assign (pl->own_title, thawer.get_str ()); break; 192 case KW_title: assign (pl->own_title, f.get_str ()); break;
175 case KW_shoottype: pl->shoottype = (rangetype) thawer.get_sint32 (); break;
176 case KW_bowtype: pl->bowtype = (bowtype_t) thawer.get_sint32 (); break; 193 case KW_bowtype: pl->bowtype = (bowtype_t) f.get_sint32 (); break;
177 case KW_petmode: pl->petmode = (petmode_t) thawer.get_sint32 (); break; 194 case KW_petmode: pl->petmode = (petmode_t) f.get_sint32 (); break;
195 case KW_gender: f.get (pl->gender); break;
178 case KW_listening: thawer.get (pl->listening); break; 196 case KW_listening: f.get (pl->listening); break;
179 case KW_peaceful: thawer.get (pl->peaceful); break; 197 case KW_peaceful: f.get (pl->peaceful); break;
180 case KW_digestion: thawer.get (pl->digestion); break; 198 case KW_digestion: f.get (pl->digestion); break;
181 case KW_pickup: thawer.get (pl->mode); break; 199 case KW_pickup: f.get (pl->mode); break;
182 case KW_outputs_sync: thawer.get (pl->outputs_sync); break; 200 case KW_outputs_sync: f.get (pl->outputs_sync); break;
183 case KW_outputs_count: thawer.get (pl->outputs_count); break; 201 case KW_outputs_count: f.get (pl->outputs_count); break;
184 case KW_map: thawer.get (pl->maplevel); break; 202 case KW_map: f.get (pl->maplevel); break;
185 case KW_savebed_map: thawer.get (pl->savebed_map); break; 203 case KW_savebed_map: f.get (pl->savebed_map); break;
186 case KW_bed_x: thawer.get (pl->bed_x); break; 204 case KW_bed_x: f.get (pl->bed_x); break;
187 case KW_bed_y: thawer.get (pl->bed_y); break; 205 case KW_bed_y: f.get (pl->bed_y); break;
188 case KW_weapon_sp: thawer.get (pl->weapon_sp); break; 206 case KW_weapon_sp: f.get (pl->weapon_sp); break;
207 case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
189 case KW_Str: thawer.get (pl->orig_stats.Str); break; 208 case KW_Str: f.get (pl->orig_stats.Str); break;
190 case KW_Dex: thawer.get (pl->orig_stats.Dex); break; 209 case KW_Dex: f.get (pl->orig_stats.Dex); break;
191 case KW_Con: thawer.get (pl->orig_stats.Con); break; 210 case KW_Con: f.get (pl->orig_stats.Con); break;
192 case KW_Int: thawer.get (pl->orig_stats.Int); break; 211 case KW_Int: f.get (pl->orig_stats.Int); break;
193 case KW_Pow: thawer.get (pl->orig_stats.Pow); break; 212 case KW_Pow: f.get (pl->orig_stats.Pow); break;
194 case KW_Wis: thawer.get (pl->orig_stats.Wis); break; 213 case KW_Wis: f.get (pl->orig_stats.Wis); break;
195 case KW_Cha: thawer.get (pl->orig_stats.Cha); break; 214 case KW_Cha: f.get (pl->orig_stats.Cha); break;
196 case KW_gen_hp: thawer.get (pl->gen_hp); break; 215 case KW_gen_hp: f.get (pl->gen_hp); break;
197 case KW_gen_sp: thawer.get (pl->gen_sp); break; 216 case KW_gen_sp: f.get (pl->gen_sp); break;
198 case KW_gen_grace: thawer.get (pl->gen_grace); break; 217 case KW_gen_grace: f.get (pl->gen_grace); break;
199 218
200 case KW_usekeys: 219 case KW_usekeys:
201 if (!strcmp (thawer.get_str (), "key_inventory")) 220 if (!strcmp (f.get_str (), "key_inventory"))
202 pl->usekeys = key_inventory; 221 pl->usekeys = key_inventory;
203 else if (!strcmp (thawer.get_str (), "keyrings")) 222 else if (!strcmp (f.get_str (), "keyrings"))
204 pl->usekeys = keyrings; 223 pl->usekeys = keyrings;
205 else if (!strcmp (thawer.get_str (), "containers")) 224 else if (!strcmp (f.get_str (), "containers"))
206 pl->usekeys = containers; 225 pl->usekeys = containers;
207 else 226 else
208 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", thawer.get_str ()); 227 LOG (llevDebug, "load_player: got unknown usekeys type: %s\n", f.get_str ());
209 break; 228 break;
210 229
211 case KW_unapply: 230 case KW_unapply:
212 if (!strcmp (thawer.get_str (), "unapply_nochoice")) 231 if (!strcmp (f.get_str (), "unapply_nochoice"))
213 pl->unapply = unapply_nochoice; 232 pl->unapply = unapply_nochoice;
214 else if (!strcmp (thawer.get_str (), "unapply_never")) 233 else if (!strcmp (f.get_str (), "unapply_never"))
215 pl->unapply = unapply_never; 234 pl->unapply = unapply_never;
216 else if (!strcmp (thawer.get_str (), "unapply_always")) 235 else if (!strcmp (f.get_str (), "unapply_always"))
217 pl->unapply = unapply_always; 236 pl->unapply = unapply_always;
218 else 237 else
219 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", thawer.get_str ()); 238 LOG (llevDebug, "load_player: got unknown unapply type: %s\n", f.get_str ());
220 break; 239 break;
221 240
222 case KW_lev_array: 241 case KW_lev_array:
223 { 242 {
224 int count = thawer.get_sint32 (); 243 int count = f.get_sint32 ();
225 244
226 for (int i = 1; i <= count; i++) 245 for (int i = 1; i <= count; i++)
227 { 246 {
228 char line [32]; 247 char line [32];
229 248
230 fgets (line, 32, thawer); pl->levhp [i] = atoi (line); 249 fgets (line, 32, f); pl->levhp [i] = atoi (line);
231 fgets (line, 32, thawer); pl->levsp [i] = atoi (line); 250 fgets (line, 32, f); pl->levsp [i] = atoi (line);
232 fgets (line, 32, thawer); pl->levgrace[i] = atoi (line); 251 fgets (line, 32, f); pl->levgrace[i] = atoi (line);
233 } 252 }
234 } 253 }
235 break; 254 break;
236
237 default:
238 LOG (llevError, "%s: skipping unknown key in player header: %s\n", thawer.name, keyword_str [kw]);
239 break;
240 } 255 }
256
257 f.next ();
241 } 258 }
242 259
243done: 260failure:
244 if (!load_object (thawer, pl->ob, 0)) 261 LOG (llevError, "%s: too many or too grave errors, aborting player load.\n", f.name);
245 { 262
263 if (pl->ob)
246 pl->ob->destroy (); 264 pl->ob->destroy ();
265
247 pl->destroy (); 266 pl->destroy ();
248 return 0;
249 }
250 267
251 INVOKE_PLAYER (LOAD, pl);
252
253 return pl;
254}
255
256player *
257player::load_pl (const char *path)
258{
259 object_thawer thawer (path);
260
261 if (!thawer)
262 return 0; 268 return 0;
263
264 return load_pl (thawer);
265} 269}
266 270

Diff Legend

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