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.107 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC

… …
124 continue; 124 continue;
125 125
126 if (*buf == '%') 126 if (*buf == '%')
127 { /* send one news */ 127 { /* send one news */
128 if (size > 0) 128 if (size > 0)
129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 129 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
130 130
131 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
132 strip_endline (subject); 132 strip_endline (subject);
133 size = 0; 133 size = 0;
134 news[0] = '\0'; 134 news[0] = '\0';
… …
144 size += strlen (buf); 144 size += strlen (buf);
145 } 145 }
146 } 146 }
147 147
148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 148 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 149 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
150 close_and_delete (fp, comp); 150 close_and_delete (fp, comp);
151} 151}
152 152
153/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
154static void 154static void
… …
194 return; 194 return;
195 195
196 terminate_all_pets (ob); 196 terminate_all_pets (ob);
197 remove_friendly_object (ob); 197 remove_friendly_object (ob);
198 ob->deactivate_recursive (); 198 ob->deactivate_recursive ();
199
200 if (ob->map)
199 maplevel = ob->map->path; 201 maplevel = ob->map->path;
202
200 ob->remove (); 203 ob->remove ();
201 ob->map = 0; 204 ob->map = 0;
202 party = 0; 205 party = 0;
203 206
204 // for weird reasons, this is often "ob", keeping a circular reference 207 // for weird reasons, this is often "ob", keeping a circular reference
… …
288 291
289 INVOKE_PLAYER (DISCONNECT, this); 292 INVOKE_PLAYER (DISCONNECT, this);
290 293
291 ns->reset_stats (); 294 ns->reset_stats ();
292 ns->pl = 0; 295 ns->pl = 0;
293 this->ns = 0; 296 ns = 0;
294 } 297 }
295 298
296 if (ob) 299 if (ob)
297 ob->close_container (); //TODO: client-specific 300 ob->close_container (); //TODO: client-specific
298 301
… …
315player::player () 318player::player ()
316{ 319{
317 /* There are some elements we want initialised to non zero value - 320 /* There are some elements we want initialised to non zero value -
318 * we deal with that below this point. 321 * we deal with that below this point.
319 */ 322 */
320 outputs_sync = 16; /* Every 2 seconds */ 323 outputs_sync = 4;
321 outputs_count = 8; /* Keeps present behaviour */ 324 outputs_count = 4;
322 unapply = unapply_nochoice; 325 unapply = unapply_nochoice;
323 326
324 savebed_map = first_map_path; /* Init. respawn position */ 327 savebed_map = first_map_path; /* Init. respawn position */
325 328
326 gen_sp_armour = 10; 329 gen_sp_armour = 10;
… …
865 * appropriate action with it (change race, or other things). 868 * appropriate action with it (change race, or other things).
866 * The function name is for historical reasons - now we have 869 * The function name is for historical reasons - now we have
867 * separate race and class; this actually changes the RACE, 870 * separate race and class; this actually changes the RACE,
868 * not the class. 871 * not the class.
869 */ 872 */
870int 873void
871key_change_class (object *op, char key) 874player::chargen_race_done ()
872{ 875{
873 int tmp_loop;
874
875 if (key == 'd' || key == 'D')
876 {
877 char buf[MAX_BUF];
878
879 /* this must before then initial items are given */ 876 /* this must before then initial items are given */
880 esrv_new_player (op->contr, op->weight + op->carrying); 877 esrv_new_player (ob->contr, ob->weight + ob->carrying);
881 878
882 treasurelist *tl = find_treasurelist ("starting_wealth"); 879 treasurelist *tl = treasurelist::find ("starting_wealth");
883 if (tl) 880 if (tl)
884 create_treasure (tl, op, 0, 0, 0); 881 create_treasure (tl, ob, 0, 0, 0);
885 882
886 INVOKE_PLAYER (BIRTH, op->contr); 883 INVOKE_PLAYER (BIRTH, ob->contr);
887 INVOKE_PLAYER (LOGIN, op->contr); 884 INVOKE_PLAYER (LOGIN, ob->contr);
888 885
889 op->contr->ns->state = ST_PLAYING; 886 ob->contr->ns->state = ST_PLAYING;
890 887
891 if (op->msg) 888 if (ob->msg)
892 op->msg = NULL; 889 ob->msg = 0;
893 890
894 /* We create this now because some of the unique maps will need it 891 /* We create this now because some of the unique maps will need it
895 * to save here. 892 * to save here.
896 */ 893 */
894 {
895 char buf[MAX_BUF];
897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 896 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898 make_path_to_file (buf); 897 make_path_to_file (buf);
898 }
899 899
900 start_info (op); 900 start_info (ob);
901 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (ob, FLAG_WIZ);
902 give_initial_items (op, op->randomitems); 902 give_initial_items (ob, ob->randomitems);
903 link_player_skills (op); 903 link_player_skills (ob);
904 esrv_send_inventory (op, op); 904 esrv_send_inventory (ob, ob);
905 op->update_stats (); 905 ob->update_stats ();
906 906
907 /* This moves the player to a different start map, if there 907 /* This moves the player to a different start map, if there
908 * is one for this race 908 * is one for this race
909 */ 909 */
910 if (*first_map_ext_path) 910 if (*first_map_ext_path)
911 { 911 {
912 object *tmp; 912 object *tmp;
913 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
914 914
915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
916 tmp = object::create (); 916 tmp = object::create ();
917 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
918 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = ob->x;
919 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = ob->y;
920 op->enter_exit (tmp); /* we don't really care if it succeeded; 920 ob->enter_exit (tmp); /* we don't really care if it succeeded;
921 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
922 * default initial map */ 922 * default initial map */
923 tmp->destroy (); 923 tmp->destroy ();
924 } 924 }
925 else 925 else
926 LOG (llevDebug, "first_map_ext_path not set\n"); 926 LOG (llevDebug, "first_map_ext_path not set\n");
927}
927 928
928 return 0; 929void
929 } 930player::chargen_race_next ()
930 931{
931 /* Following actually changes the race - this is the default command 932 /* Following actually changes the race - this is the default command
932 * if we don't match with one of the options above. 933 * if we don't match with one of the options above.
933 */ 934 */
934 935
935 tmp_loop = 0; 936 do
936 while (!tmp_loop)
937 { 937 {
938 shstr name = op->name; 938 shstr name = ob->name;
939 int x = op->x, y = op->y; 939 int x = ob->x, y = ob->y;
940 940
941 op->remove_statbonus (); 941 ob->remove_statbonus ();
942 op->remove (); 942 ob->remove ();
943 op->arch = get_player_archetype (op->arch); 943 ob->arch = get_player_archetype (ob->arch);
944 op->arch->clone.copy_to (op); 944 ob->arch->clone.copy_to (ob);
945 op->instantiate (); 945 ob->instantiate ();
946 op->stats = op->contr->orig_stats; 946 ob->stats = ob->contr->orig_stats;
947 op->name = op->name_pl = name; 947 ob->name = ob->name_pl = name;
948 op->x = x; 948 ob->x = x;
949 op->y = y; 949 ob->y = y;
950 SET_ANIMATION (op, 2); /* So player faces south */ 950 SET_ANIMATION (ob, 2); /* So player faces south */
951 insert_ob_in_map (op, op->map, op, 0); 951 insert_ob_in_map (ob, ob->map, ob, 0);
952 assign (op->contr->title, op->arch->clone.name); 952 assign (ob->contr->title, ob->arch->clone.name);
953 op->add_statbonus (); 953 ob->add_statbonus ();
954 tmp_loop = allowed_class (op);
955 } 954 }
955 while (!allowed_class (ob));
956 956
957 update_object (op, UP_OBJ_FACE); 957 update_object (ob, UP_OBJ_FACE);
958 esrv_update_item (UPD_FACE, op, op); 958 esrv_update_item (UPD_FACE, ob, ob);
959 op->update_stats (); 959 ob->update_stats ();
960 op->stats.hp = op->stats.maxhp; 960 ob->stats.hp = ob->stats.maxhp;
961 op->stats.sp = op->stats.maxsp; 961 ob->stats.sp = ob->stats.maxsp;
962 op->stats.grace = 0; 962 ob->stats.grace = 0;
963
964 if (op->msg)
965 new_draw_info (NDI_BLUE, 0, op, op->msg);
966
967 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
968 return 0;
969} 963}
970 964
971void 965void
972flee_player (object *op) 966flee_player (object *op)
973{ 967{
… …
1596 if (op->type == PLAYER) 1590 if (op->type == PLAYER)
1597 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1591 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1598 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1592 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1599 else 1593 else
1600 CLEAR_FLAG (op, FLAG_READY_BOW); 1594 CLEAR_FLAG (op, FLAG_READY_BOW);
1595
1601 return 0; 1596 return 0;
1602 } 1597 }
1603 } 1598 }
1604 1599
1605 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1600 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1636 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1631 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1637 op->update_stats (); 1632 op->update_stats ();
1638 } 1633 }
1639 1634
1640 SET_ANIMATION (arrow, arrow->direction); 1635 SET_ANIMATION (arrow, arrow->direction);
1636
1641 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1637 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1642 arrow->stats.hp = arrow->stats.dam; 1638 arrow->stats.hp = arrow->stats.dam;
1643 arrow->stats.grace = arrow->attacktype; 1639 arrow->stats.grace = arrow->attacktype;
1640
1644 if (arrow->slaying != NULL) 1641 if (arrow->slaying)
1645 arrow->spellarg = strdup (arrow->slaying); 1642 arrow->spellarg = strdup (arrow->slaying);
1646 1643
1647 /* Note that this was different for monsters - they got their level 1644 arrow->stats.dam += op->stats.dam + arrow->magic;
1648 * added to the damage. I think the strength bonus is more proper.
1649 */
1650
1651 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1652 1645
1653 /* update the speed */ 1646 /* update the speed */
1654 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1647 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1655 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1648 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1656 1649
1657 arrow->set_speed (max (arrow->speed, 1.0)); 1650 arrow->set_speed (max (arrow->speed, 1.0));
1658 arrow->speed_left = 0; 1651 arrow->speed_left = 0;
1659 1652
1653 arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1654
1660 if (op->type == PLAYER) 1655 if (op->type == PLAYER)
1661 { 1656 {
1662 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1663 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1664 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1665
1666 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1657 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1658 arrow->stats.wc -= dex_bonus[op->stats.Dex];
1659
1660 if (!arrow->slaying)
1661 arrow->slaying = op->slaying;
1667 } 1662 }
1668 else 1663 else
1669 { 1664 {
1670 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1671 arrow->level = op->level; 1665 arrow->level = op->level;
1672 } 1666 arrow->stats.wc -= bow->magic;
1673 1667
1674 if (arrow->attacktype == AT_PHYSICAL) 1668 if (!arrow->slaying)
1669 arrow->slaying = bow->slaying;
1670 }
1671
1672 arrow->stats.wc -= arrow->level;
1673
1675 arrow->attacktype |= bow->attacktype; 1674 arrow->attacktype |= bow->attacktype;
1676
1677 if (bow->slaying)
1678 arrow->slaying = bow->slaying;
1679 1675
1680 arrow->move_type = MOVE_FLY_LOW; 1676 arrow->move_type = MOVE_FLY_LOW;
1681 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1677 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1682 1678
1683 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1679 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
… …
1836 case range_misc: 1832 case range_misc:
1837 fire_misc_object (op, dir); 1833 fire_misc_object (op, dir);
1838 return; 1834 return;
1839 1835
1840 case range_golem: /* Control summoned monsters from scrolls */ 1836 case range_golem: /* Control summoned monsters from scrolls */
1841 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1842 {
1843 op->contr->ranges[range_golem] = 0;
1844 op->contr->shoottype = range_none;
1845 }
1846 else
1847 control_golem (op->contr->ranges[range_golem], dir); 1837 control_golem (op->contr->ranges[range_golem], dir);
1848 return; 1838 return;
1849 1839
1850 case range_skill: 1840 case range_skill:
1851 if (!op->chosen_skill) 1841 if (!op->chosen_skill)
1852 { 1842 {
1853 if (op->type == PLAYER) 1843 if (op->type == PLAYER)
1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1844 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1845
1855 return; 1846 return;
1856 } 1847 }
1857 1848
1858 do_skill (op, op, op->chosen_skill, dir, NULL); 1849 do_skill (op, op, op->chosen_skill, dir, NULL);
1859 return; 1850 return;
… …
2267 op->speed_left--; 2258 op->speed_left--;
2268 return 0; 2259 return 0;
2269 } 2260 }
2270 } 2261 }
2271 2262
2272 /* I've been seeing crashes where the golem has been destroyed, but
2273 * the player object still points to the defunct golem. The code that
2274 * destroys the golem looks correct, and it doesn't always happen, so
2275 * put this in a a workaround to clean up the golem pointer.
2276 */
2277 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2278 op->contr->ranges[range_golem] = 0;
2279
2280 /* call this here - we also will call this in do_ericserver, but 2263 /* call this here - we also will call this in do_ericserver, but
2281 * the players time has been increased when doericserver has been 2264 * the players time has been increased when doericserver has been
2282 * called, so we recheck it here. 2265 * called, so we recheck it here.
2283 */ 2266 */
2284 if (op->contr->ns->handle_command ()) 2267 if (op->contr->ns->handle_command ())
… …
2438 make_visible (op); 2421 make_visible (op);
2439 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2422 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2440 } 2423 }
2441 } 2424 }
2442 2425
2443 if (op->contr->outputs_sync)
2444 {
2445 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2446 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2447 flush_output_element (op, &op->contr->outputs[i]);
2448 }
2449
2450 if (op->contr->ns->state == ST_PLAYING) 2426 if (op->contr->ns->state == ST_PLAYING)
2451 { 2427 {
2452 /* these next three if clauses make it possible to SLOW DOWN 2428 /* these next three if clauses make it possible to SLOW DOWN
2453 hp/grace/spellpoint regeneration. */ 2429 hp/grace/spellpoint regeneration. */
2454 if (op->contr->gen_hp >= 0) 2430 if (op->contr->gen_hp >= 0)
… …
2474 gen_grace = op->stats.maxgrace; 2450 gen_grace = op->stats.maxgrace;
2475 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2451 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2476 } 2452 }
2477 2453
2478 /* Regenerate Spell Points */ 2454 /* Regenerate Spell Points */
2479 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2455 if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2480 { 2456 {
2481 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2457 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2482 if (op->stats.sp < op->stats.maxsp) 2458 if (op->stats.sp < op->stats.maxsp)
2483 { 2459 {
2484 op->stats.sp++; 2460 op->stats.sp++;
… …
2909 op->stats.hp = op->stats.maxhp; 2885 op->stats.hp = op->stats.maxhp;
2910 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2886 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2911 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2887 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2912 2888
2913 /* 2889 /*
2914 * Check to see if the player is in a shop. IF so, then check to see if
2915 * the player has any unpaid items. If so, remove them and put them back 2890 * Check to see if the player has any unpaid items. If so, remove them
2916 * in the map. 2891 * and put them back in the map.
2917 */ 2892 */
2918
2919 if (is_in_shop (op))
2920 remove_unpaid_objects (op->inv, op); 2893 remove_unpaid_objects (op->inv, op);
2921 2894
2922 /****************************************/ 2895 /****************************************/
2923 /* */ 2896 /* */
2924 /* Move player to his current respawn- */ 2897 /* Move player to his current respawn- */
2925 /* position (usually last savebed) */ 2898 /* position (usually last savebed) */
… …
3374 char buf[MAX_BUF]; /* tmp. string buffer */ 3347 char buf[MAX_BUF]; /* tmp. string buffer */
3375 int i = 0, j = 0; 3348 int i = 0, j = 0;
3376 3349
3377 /* get the appropriate treasurelist */ 3350 /* get the appropriate treasurelist */
3378 if (atnr == ATNR_FIRE) 3351 if (atnr == ATNR_FIRE)
3379 trlist = find_treasurelist ("dragon_ability_fire"); 3352 trlist = treasurelist::find ("dragon_ability_fire");
3380 else if (atnr == ATNR_COLD) 3353 else if (atnr == ATNR_COLD)
3381 trlist = find_treasurelist ("dragon_ability_cold"); 3354 trlist = treasurelist::find ("dragon_ability_cold");
3382 else if (atnr == ATNR_ELECTRICITY) 3355 else if (atnr == ATNR_ELECTRICITY)
3383 trlist = find_treasurelist ("dragon_ability_elec"); 3356 trlist = treasurelist::find ("dragon_ability_elec");
3384 else if (atnr == ATNR_POISON) 3357 else if (atnr == ATNR_POISON)
3385 trlist = find_treasurelist ("dragon_ability_poison"); 3358 trlist = treasurelist::find ("dragon_ability_poison");
3386 3359
3387 if (trlist == NULL || who->type != PLAYER) 3360 if (trlist == NULL || who->type != PLAYER)
3388 return; 3361 return;
3389 3362
3390 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3363 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);

Diff Legend

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