ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.146 by root, Sun Jun 3 17:05:36 2007 UTC vs.
Revision 1.150 by root, Sun Jun 10 03:11:17 2007 UTC

207 ob->close_container (); //TODO: client-specific 207 ob->close_container (); //TODO: client-specific
208 208
209 ns->update_look = 0; 209 ns->update_look = 0;
210 ns->look_position = 0; 210 ns->look_position = 0;
211 211
212 clear_los (ob); 212 clear_los (this);
213 213
214 ns->reset_stats (); 214 ns->reset_stats ();
215 215
216 /* make sure he's a player -- needed because of class change. */ 216 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid 217 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->clone.race; 218 ob->race = ob->arch->race;
219 219
220 ob->carrying = sum_weight (ob); 220 ob->carrying = sum_weight (ob);
221 link_player_skills (ob); 221 link_player_skills (ob);
222 222
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224 224
225 assign (title, ob->arch->clone.name); 225 assign (title, ob->arch->object::name);
226 226
227 /* if it's a dragon player, set the correct title here */ 227 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 228 if (is_dragon_pl (ob))
229 { 229 {
230 object *tmp, *abil = 0, *skin = 0; 230 object *tmp, *abil = 0, *skin = 0;
232 shstr_cmp dragon_ability_force ("dragon_ability_force"); 232 shstr_cmp dragon_ability_force ("dragon_ability_force");
233 shstr_cmp dragon_skin_force ("dragon_skin_force"); 233 shstr_cmp dragon_skin_force ("dragon_skin_force");
234 234
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 235 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 236 if (tmp->type == FORCE)
237 if (tmp->arch->name == dragon_ability_force) 237 if (tmp->arch->archname == dragon_ability_force)
238 abil = tmp; 238 abil = tmp;
239 else if (tmp->arch->name == dragon_skin_force) 239 else if (tmp->arch->archname == dragon_skin_force)
240 skin = tmp; 240 skin = tmp;
241 241
242 set_dragon_name (ob, abil, skin); 242 set_dragon_name (ob, abil, skin);
243 } 243 }
244 244
303 } 303 }
304 304
305 if (ob) 305 if (ob)
306 ob->close_container (); //TODO: client-specific 306 ob->close_container (); //TODO: client-specific
307 307
308 observe = ob;
309
308 deactivate (); 310 deactivate ();
309} 311}
310 312
311// the need for this function can be explained 313// the need for this function can be explained
312// by load_object not returning the object 314// by load_object not returning the object
324 326
325void 327void
326player::set_observe (object *op) 328player::set_observe (object *op)
327{ 329{
328 observe = op ? op : ob; 330 observe = op ? op : ob;
331 do_los = 1;
329} 332}
330 333
331player::player () 334player::player ()
332{ 335{
333 /* There are some elements we want initialised to non zero value - 336 /* There are some elements we want initialised to non zero value -
397 * Note: there MUST be at least one player archetype! 400 * Note: there MUST be at least one player archetype!
398 */ 401 */
399archetype * 402archetype *
400get_player_archetype (archetype *at) 403get_player_archetype (archetype *at)
401{ 404{
402 archetype *start = at; 405 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
403 406
404 for (;;) 407 for (;;)
405 { 408 {
406 if (at == NULL || at->next == NULL) 409 if (++i == archetypes.end ())
407 at = first_archetype; 410 i = archetypes.begin ();
408 else 411 else if (*i == at)
409 at = at->next; 412 cleanup ("not a single player archetype found");
410 413
411 if (at->clone.type == PLAYER) 414 if ((*i)->type == PLAYER)
412 return at; 415 return *i;
413
414 if (at == start)
415 {
416 LOG (llevError, "No Player archetypes\n");
417 exit (-1);
418 }
419 } 416 }
420} 417}
421 418
422object * 419object *
423get_nearest_player (object *mon) 420get_nearest_player (object *mon)
913 if (*first_map_ext_path) 910 if (*first_map_ext_path)
914 { 911 {
915 object *tmp; 912 object *tmp;
916 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
917 914
918 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
919 tmp = object::create (); 916 tmp = object::create ();
920 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
921 EXIT_X (tmp) = ob->x; 918 EXIT_X (tmp) = ob->x;
922 EXIT_Y (tmp) = ob->y; 919 EXIT_Y (tmp) = ob->y;
923 ob->enter_exit (tmp); /* we don't really care if it succeeded; 920 ob->enter_exit (tmp); /* we don't really care if it succeeded;
942 int x = ob->x, y = ob->y; 939 int x = ob->x, y = ob->y;
943 940
944 ob->remove_statbonus (); 941 ob->remove_statbonus ();
945 ob->remove (); 942 ob->remove ();
946 ob->arch = get_player_archetype (ob->arch); 943 ob->arch = get_player_archetype (ob->arch);
947 ob->arch->clone.copy_to (ob); 944 ob->arch->copy_to (ob);
948 ob->instantiate (); 945 ob->instantiate ();
949 ob->stats = ob->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
950 ob->name = ob->name_pl = name; 947 ob->name = ob->name_pl = name;
951 ob->x = x; 948 ob->x = x;
952 ob->y = y; 949 ob->y = y;
953 SET_ANIMATION (ob, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
954 insert_ob_in_map (ob, ob->map, ob, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
955 assign (ob->contr->title, ob->arch->clone.name); 952 assign (ob->contr->title, ob->arch->object::name);
956 ob->add_statbonus (); 953 ob->add_statbonus ();
957 } 954 }
958 while (!allowed_class (ob)); 955 while (!allowed_class (ob));
959 956
960 update_object (ob, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
1105 if (tmp->name != NULL) 1102 if (tmp->name != NULL)
1106 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1103 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1107 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1104 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1108 else 1105 else
1109 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1106 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1110 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1107 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1111 1108
1112 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1109 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1113 } 1110 }
1114 1111
1115 /* philosophy: 1112 /* philosophy:
1308 /* careful: chairs and tables are weapons! */ 1305 /* careful: chairs and tables are weapons! */
1309 if (op->contr->mode & PU_ALLWEAPON) 1306 if (op->contr->mode & PU_ALLWEAPON)
1310 { 1307 {
1311 if (tmp->type == WEAPON && tmp->name != NULL) 1308 if (tmp->type == WEAPON && tmp->name != NULL)
1312 { 1309 {
1313 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1310 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1314 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1311 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1315 { 1312 {
1316 pick_up (op, tmp); 1313 pick_up (op, tmp);
1317 continue; 1314 continue;
1318 } 1315 }
1319 } 1316 }
1320 1317
1321 if (tmp->type == WEAPON && tmp->name == NULL) 1318 if (tmp->type == WEAPON && tmp->name == NULL)
1322 { 1319 {
1323 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1320 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1324 { 1321 {
1325 pick_up (op, tmp); 1322 pick_up (op, tmp);
1326 continue; 1323 continue;
1327 } 1324 }
1328 } 1325 }
1353 if (tmp->name != NULL) 1350 if (tmp->name != NULL)
1354 { 1351 {
1355 fprintf (stderr, "%s", tmp->name); 1352 fprintf (stderr, "%s", tmp->name);
1356 } 1353 }
1357 else 1354 else
1358 fprintf (stderr, "%s", tmp->arch->name); 1355 fprintf (stderr, "%s", tmp->arch->archname);
1359 fprintf (stderr, ",%d] = ", tmp->type); 1356 fprintf (stderr, ",%d] = ", tmp->type);
1360 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1357 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1361#endif 1358#endif
1362 continue; 1359 continue;
1363 } 1360 }
1433 else 1430 else
1434 { 1431 {
1435 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1432 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1436 { 1433 {
1437 attacktype = 1 << attacknum; 1434 attacktype = 1 << attacknum;
1438 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1435 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1439 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1436 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1440 { 1437 {
1441 tmp = arrow; 1438 tmp = arrow;
1442 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1439 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1443 } 1440 }
1444 } 1441 }
1445 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1442 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1446 { 1443 {
1447 tmp = arrow; 1444 tmp = arrow;
1806 object *tmp; 1803 object *tmp;
1807 1804
1808 if (item->arch) 1805 if (item->arch)
1809 { 1806 {
1810 CLEAR_FLAG (item, FLAG_ANIMATE); 1807 CLEAR_FLAG (item, FLAG_ANIMATE);
1811 item->face = item->arch->clone.face; 1808 item->face = item->arch->face;
1812 item->set_speed (0); 1809 item->set_speed (0);
1813 } 1810 }
1814 1811
1815 if ((tmp = item->in_player ())) 1812 if ((tmp = item->in_player ()))
1816 esrv_update_item (UPD_ANIM, tmp, item); 1813 esrv_update_item (UPD_ANIM, tmp, item);
3039} 3036}
3040 3037
3041int 3038int
3042is_true_undead (object *op) 3039is_true_undead (object *op)
3043{ 3040{
3044 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3041 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3045 return 1; 3042 return 1;
3046 3043
3047 return 0; 3044 return 0;
3048} 3045}
3049 3046
3219 * a blocked los square. 3216 * a blocked los square.
3220 * we use the archetype to figure out offsets. 3217 * we use the archetype to figure out offsets.
3221 */ 3218 */
3222 while (op) 3219 while (op)
3223 { 3220 {
3224 dx = rv.distance_x + op->arch->clone.x; 3221 dx = rv.distance_x + op->arch->x;
3225 dy = rv.distance_y + op->arch->clone.y; 3222 dy = rv.distance_y + op->arch->y;
3226 3223
3227 /* only the viewable area the player sees is updated by LOS 3224 /* only the viewable area the player sees is updated by LOS
3228 * code, so we need to restrict ourselves to that range of values 3225 * code, so we need to restrict ourselves to that range of values
3229 * for any meaningful values. 3226 * for any meaningful values.
3230 */ 3227 */
3355 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3352 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3356 return; 3353 return;
3357 } 3354 }
3358 3355
3359 /* everything seems okay - now bring on the gift: */ 3356 /* everything seems okay - now bring on the gift: */
3360 item = &(tr->item->clone); 3357 item = tr->item;
3361 3358
3362 if (item->type == SPELL) 3359 if (item->type == SPELL)
3363 { 3360 {
3364 if (check_spell_known (who, item->name)) 3361 if (check_spell_known (who, item->name))
3365 return; 3362 return;
3425 /* forces in the treasurelist can alter the player's stats */ 3422 /* forces in the treasurelist can alter the player's stats */
3426 object *skin; 3423 object *skin;
3427 3424
3428 /* first get the dragon skin force */ 3425 /* first get the dragon skin force */
3429 shstr_cmp dragon_skin_force ("dragon_skin_force"); 3426 shstr_cmp dragon_skin_force ("dragon_skin_force");
3430 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3427 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below)
3431 ; 3428 ;
3432 3429
3433 if (!skin) 3430 if (!skin)
3434 return; 3431 return;
3435 3432

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines