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.29 by root, Sun Dec 3 00:59:58 2006 UTC vs.
Revision 1.43 by root, Sat Dec 16 03:08:26 2006 UTC

… …
20 20
21 The author can be reached via e-mail to <crossfire@schmorp.de> 21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22*/
23 23
24#include <global.h> 24#include <global.h>
25#ifndef WIN32 /* ---win32 remove headers */
26# include <pwd.h> 25#include <pwd.h>
27#endif
28#ifndef __CEXTRACT__
29# include <sproto.h> 26#include <sproto.h>
30#endif
31#include <sounds.h> 27#include <sounds.h>
32#include <living.h> 28#include <living.h>
33#include <object.h> 29#include <object.h>
34#include <spells.h> 30#include <spells.h>
35#include <skills.h> 31#include <skills.h>
36#include <newclient.h>
37 32
38#ifdef COZY_SERVER 33#ifdef COZY_SERVER
39extern int same_party (partylist *a, partylist *b); 34extern int same_party (partylist *a, partylist *b);
40#endif 35#endif
41 36
… …
208 * the one that is passed. 203 * the one that is passed.
209 */ 204 */
210static player * 205static player *
211get_player (player *p) 206get_player (player *p)
212{ 207{
213 object *op = arch_to_object (get_player_archetype (NULL)); 208 object *op = arch_to_object (get_player_archetype (0));
214 int i; 209 int i;
215
216 if (!p)
217 {
218 p = new player;
219
220 /* This adds the player in the linked list. There is extra
221 * complexity here because we want to add the new player at the
222 * end of the list - there is in fact no compelling reason that
223 * that needs to be done except for things like output of
224 * 'who'.
225 */
226 player *tmp = first_player;
227
228 while (tmp != NULL && tmp->next != NULL)
229 tmp = tmp->next;
230 if (tmp != NULL)
231 tmp->next = p;
232 else
233 first_player = p;
234
235 p->next = NULL;
236 }
237 210
238 /* Clears basically the entire player structure except 211 /* Clears basically the entire player structure except
239 * for next and socket. 212 * for next and socket.
240 */ 213 */
241 p->clear (); 214 p->clear ();
… …
260 op->speed_left = 0.5; 233 op->speed_left = 0.5;
261 op->speed = 1.0; 234 op->speed = 1.0;
262 op->direction = 5; /* So player faces south */ 235 op->direction = 5; /* So player faces south */
263 op->stats.wc = 2; 236 op->stats.wc = 2;
264 op->run_away = 25; /* Then we panick... */ 237 op->run_away = 25; /* Then we panick... */
238
239 {
240 int oldmon = p->socket->monitor_spells; // what a hack
265 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */ 241 p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
266
267 roll_stats (op); 242 roll_stats (op);
243 p->socket->monitor_spells = oldmon;
244 }
268 p->state = ST_ROLL_STAT; 245 p->state = ST_ROLL_STAT;
269 clear_los (op); 246 clear_los (op);
270 247
271 p->gen_sp_armour = 10; 248 p->gen_sp_armour = 10;
272 p->last_speed = -1; 249 p->last_speed = -1;
… …
294 for (i = 0; i < NUM_SKILLS; i++) 271 for (i = 0; i < NUM_SKILLS; i++)
295 { 272 {
296 p->last_skill_exp[i] = -1; 273 p->last_skill_exp[i] = -1;
297 p->last_skill_ob[i] = NULL; 274 p->last_skill_ob[i] = NULL;
298 } 275 }
276
299 for (i = 0; i < NROFATTACKS; i++) 277 for (i = 0; i < NROFATTACKS; i++)
300 {
301 p->last_resist[i] = -1; 278 p->last_resist[i] = -1;
302 } 279
303 p->last_stats.exp = -1; 280 p->last_stats.exp = -1;
304 p->last_weight = (uint32) - 1; 281 p->last_weight = (uint32) - 1;
305 282
306 p->socket.update_look = 0; 283 p->socket->update_look = 0;
307 p->socket.look_position = 0; 284 p->socket->look_position = 0;
285
308 return p; 286 return p;
309} 287}
310 288
311/* This loads the first map an puts the player on it. */ 289/* This loads the first map an puts the player on it. */
312static void 290static void
… …
322 * All we can really get in this is some settings like host and display 300 * All we can really get in this is some settings like host and display
323 * mode. 301 * mode.
324 */ 302 */
325 303
326int 304int
327add_player (NewSocket * ns) 305add_player (client *ns)
328{ 306{
329 player *p; 307 player *p = new player;
330 308
331 p = get_player (NULL);
332 p->socket = *ns; 309 p->socket = ns;
333 p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent)); 310 ns->pl = p;
334 311
335 if (p->socket.faces_sent == NULL) 312 p->next = first_player;
336 fatal (OUT_OF_MEMORY); 313 first_player = p;
337 314
338 memcpy (p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len * sizeof (*p->socket.faces_sent)); 315 p = get_player (p);
339 /* Needed because the socket we just copied over needs to be cleared. 316
340 * Note that this can result in a client reset if there is partial data
341 * on the uncoming socket.
342 */
343 p->socket.inbuf.len = 0;
344 set_first_map (p->ob); 317 set_first_map (p->ob);
345 318
346 CLEAR_FLAG (p->ob, FLAG_FRIENDLY); 319 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
347 add_friendly_object (p->ob); 320 add_friendly_object (p->ob);
348 send_rules (p->ob); 321 send_rules (p->ob);
… …
646 (op->type == ARMOUR || op->type == BOOTS || 619 (op->type == ARMOUR || op->type == BOOTS ||
647 op->type == CLOAK || op->type == HELMET || 620 op->type == CLOAK || op->type == HELMET ||
648 op->type == SHIELD || op->type == GLOVES || 621 op->type == SHIELD || op->type == GLOVES ||
649 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 622 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
650 { 623 {
651 remove_ob (op); 624 op->destroy ();
652 free_object (op);
653 continue; 625 continue;
654 } 626 }
655 } 627 }
656 628
657 /* This really needs to be better - we should really give 629 /* This really needs to be better - we should really give
… …
668 if (tmp->type == op->type && tmp->name == op->name) 640 if (tmp->type == op->type && tmp->name == op->name)
669 break; 641 break;
670 642
671 if (tmp) 643 if (tmp)
672 { 644 {
673 remove_ob (op); 645 op->destroy ();
674 free_object (op);
675 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name); 646 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
676 continue; 647 continue;
677 } 648 }
649
678 if (op->nrof > 1) 650 if (op->nrof > 1)
679 op->nrof = 1; 651 op->nrof = 1;
680 } 652 }
681 653
682 if (op->type == SPELLBOOK && op->inv) 654 if (op->type == SPELLBOOK && op->inv)
… …
694 CLEAR_FLAG (op, FLAG_CURSED); 666 CLEAR_FLAG (op, FLAG_CURSED);
695 CLEAR_FLAG (op, FLAG_DAMNED); 667 CLEAR_FLAG (op, FLAG_DAMNED);
696 } 668 }
697 if (op->type == SPELL) 669 if (op->type == SPELL)
698 { 670 {
699 remove_ob (op); 671 op->destroy ();
700 free_object (op);
701 continue; 672 continue;
702 } 673 }
703 else if (op->type == SKILL) 674 else if (op->type == SKILL)
704 { 675 {
705 SET_FLAG (op, FLAG_CAN_USE_SKILL); 676 SET_FLAG (op, FLAG_CAN_USE_SKILL);
… …
718void 689void
719get_name (object *op) 690get_name (object *op)
720{ 691{
721 op->contr->write_buf[0] = '\0'; 692 op->contr->write_buf[0] = '\0';
722 op->contr->state = ST_GET_NAME; 693 op->contr->state = ST_GET_NAME;
723 send_query (&op->contr->socket, 0, "What is your name?\n:"); 694 send_query (op->contr->socket, 0, "What is your name?\n:");
724} 695}
725 696
726void 697void
727get_password (object *op) 698get_password (object *op)
728{ 699{
729 op->contr->write_buf[0] = '\0'; 700 op->contr->write_buf[0] = '\0';
730 op->contr->state = ST_GET_PASSWORD; 701 op->contr->state = ST_GET_PASSWORD;
731 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:"); 702 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
732} 703}
733 704
734void 705void
735play_again (object *op) 706play_again (object *op)
736{ 707{
737 op->contr->state = ST_PLAY_AGAIN; 708 op->contr->state = ST_PLAY_AGAIN;
738 op->chosen_skill = NULL; 709 op->chosen_skill = NULL;
739 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?"); 710 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
740 /* a bit of a hack, but there are various places early in th 711 /* a bit of a hack, but there are various places early in th
741 * player creation process that a user can quit (eg, roll 712 * player creation process that a user can quit (eg, roll
742 * stats) that isn't removing the player. Taking a quick 713 * stats) that isn't removing the player. Taking a quick
743 * look, there are many places that call play_again without 714 * look, there are many places that call play_again without
744 * removing the player - it probably makes more sense 715 * removing the player - it probably makes more sense
745 * to leave it to play_again to remove the object in all 716 * to leave it to play_again to remove the object in all
746 * cases. 717 * cases.
747 */ 718 */
748 if (!QUERY_FLAG (op, FLAG_REMOVED)) 719 if (!QUERY_FLAG (op, FLAG_REMOVED))
749 remove_ob (op); 720 op->remove ();
750 /* Need to set this to null - otherwise, it could point to garbage, 721 /* Need to set this to null - otherwise, it could point to garbage,
751 * and draw() doesn't check to see if the player is removed, only if 722 * and draw() doesn't check to see if the player is removed, only if
752 * the map is null or not swapped out. 723 * the map is null or not swapped out.
753 */ 724 */
754 op->map = NULL; 725 op->map = NULL;
… …
793confirm_password (object *op) 764confirm_password (object *op)
794{ 765{
795 766
796 op->contr->write_buf[0] = '\0'; 767 op->contr->write_buf[0] = '\0';
797 op->contr->state = ST_CONFIRM_PASSWORD; 768 op->contr->state = ST_CONFIRM_PASSWORD;
798 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:"); 769 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
799} 770}
800 771
801void 772void
802get_party_password (object *op, partylist *party) 773get_party_password (object *op, partylist *party)
803{ 774{
… …
807 return; 778 return;
808 } 779 }
809 op->contr->write_buf[0] = '\0'; 780 op->contr->write_buf[0] = '\0';
810 op->contr->state = ST_GET_PARTY_PASSWORD; 781 op->contr->state = ST_GET_PARTY_PASSWORD;
811 op->contr->party_to_join = party; 782 op->contr->party_to_join = party;
812 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 783 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");
813} 784}
814 785
815 786
816/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 787/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
817int 788int
… …
914 885
915void 886void
916Roll_Again (object *op) 887Roll_Again (object *op)
917{ 888{
918 esrv_new_player (op->contr, 0); 889 esrv_new_player (op->contr, 0);
919 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, 890 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
920 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 891 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
921} 892}
922 893
923void 894void
924Swap_Stat (object *op, int Swap_Second) 895Swap_Stat (object *op, int Swap_Second)
… …
991 new_draw_info (NDI_UNIQUE, 0, op, buf); 962 new_draw_info (NDI_UNIQUE, 0, op, buf);
992 } 963 }
993 else 964 else
994 Swap_Stat (op, stat_trans[keynum]); 965 Swap_Stat (op, stat_trans[keynum]);
995 966
996 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, ""); 967 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
997 return 1; 968 return 1;
998 } 969 }
999 switch (key) 970 switch (key)
1000 { 971 {
1001 case 'n': 972 case 'n':
… …
1015 enter_exit (op, NULL); 986 enter_exit (op, NULL);
1016#endif 987#endif
1017 SET_ANIMATION (op, 2); /* So player faces south */ 988 SET_ANIMATION (op, 2); /* So player faces south */
1018 /* Enter exit adds a player otherwise */ 989 /* Enter exit adds a player otherwise */
1019 add_statbonus (op); 990 add_statbonus (op);
1020 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, 991 send_query (op->contr->socket, CS_QUERY_SINGLECHAR,
1021 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 992 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1022 op->contr->state = ST_CHANGE_CLASS; 993 op->contr->state = ST_CHANGE_CLASS;
1023 if (op->msg) 994 if (op->msg)
1024 new_draw_info (NDI_BLUE, 0, op, op->msg); 995 new_draw_info (NDI_BLUE, 0, op, op->msg);
1025 return 0; 996 return 0;
1026 } 997 }
1027 case 'y': 998 case 'y':
1028 case 'Y': 999 case 'Y':
1029 roll_stats (op); 1000 roll_stats (op);
1030 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, ""); 1001 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "");
1031 return 1; 1002 return 1;
1032 1003
1033 case 'q': 1004 case 'q':
1034 case 'Q': 1005 case 'Q':
1035 play_again (op); 1006 play_again (op);
1036 return 1; 1007 return 1;
1037 1008
1038 default: 1009 default:
1039 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?"); 1010 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1040 return 0; 1011 return 0;
1041 } 1012 }
1042 return 0; 1013 return 0;
1043} 1014}
1044 1015
… …
1054{ 1025{
1055 int tmp_loop; 1026 int tmp_loop;
1056 1027
1057 if (key == 'q' || key == 'Q') 1028 if (key == 'q' || key == 'Q')
1058 { 1029 {
1059 remove_ob (op); 1030 op->remove ();
1060 play_again (op); 1031 play_again (op);
1061 return 0; 1032 return 0;
1062 } 1033 }
1063 if (key == 'd' || key == 'D') 1034 if (key == 'd' || key == 'D')
1064 { 1035 {
1065 char buf[MAX_BUF]; 1036 char buf[MAX_BUF];
1066 1037
1067 /* this must before then initial items are given */ 1038 /* this must before then initial items are given */
1068 esrv_new_player (op->contr, op->weight + op->carrying); 1039 esrv_new_player (op->contr, op->weight + op->carrying);
1040
1069 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0); 1041 treasurelist *tl = find_treasurelist ("starting_wealth");
1042 if (tl)
1043 create_treasure (tl, op, 0, 0, 0);
1070 1044
1071 INVOKE_PLAYER (BIRTH, op->contr); 1045 INVOKE_PLAYER (BIRTH, op->contr);
1072 INVOKE_PLAYER (LOGIN, op->contr); 1046 INVOKE_PLAYER (LOGIN, op->contr);
1073 1047
1074 op->contr->state = ST_PLAYING; 1048 op->contr->state = ST_PLAYING;
… …
1099 { 1073 {
1100 object *tmp; 1074 object *tmp;
1101 char mapname[MAX_BUF]; 1075 char mapname[MAX_BUF];
1102 1076
1103 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 1077 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
1104 tmp = get_object (); 1078 tmp = object::create ();
1105 EXIT_PATH (tmp) = mapname; 1079 EXIT_PATH (tmp) = mapname;
1106 EXIT_X (tmp) = op->x; 1080 EXIT_X (tmp) = op->x;
1107 EXIT_Y (tmp) = op->y; 1081 EXIT_Y (tmp) = op->y;
1108 enter_exit (op, tmp); /* we don't really care if it succeeded; 1082 enter_exit (op, tmp); /* we don't really care if it succeeded;
1109 * if the map isn't there, then stay on the 1083 * if the map isn't there, then stay on the
1110 * default initial map */ 1084 * default initial map */
1111 free_object (tmp); 1085 tmp->destroy ();
1112 } 1086 }
1113 else 1087 else
1114 { 1088 {
1115 LOG (llevDebug, "first_map_ext_path not set\n"); 1089 LOG (llevDebug, "first_map_ext_path not set\n");
1116 } 1090 }
… …
1126 { 1100 {
1127 shstr name = op->name; 1101 shstr name = op->name;
1128 int x = op->x, y = op->y; 1102 int x = op->x, y = op->y;
1129 1103
1130 remove_statbonus (op); 1104 remove_statbonus (op);
1131 remove_ob (op); 1105 op->remove ();
1132 op->arch = get_player_archetype (op->arch); 1106 op->arch = get_player_archetype (op->arch);
1133 copy_object (&op->arch->clone, op); 1107 op->arch->clone.copy_to (op);
1134 op->instantiate (); 1108 op->instantiate ();
1135 op->stats = op->contr->orig_stats; 1109 op->stats = op->contr->orig_stats;
1136 op->name = op->name_pl = name; 1110 op->name = op->name_pl = name;
1137 op->x = x; 1111 op->x = x;
1138 op->y = y; 1112 op->y = y;
… …
1151 op->stats.grace = 0; 1125 op->stats.grace = 0;
1152 1126
1153 if (op->msg) 1127 if (op->msg)
1154 new_draw_info (NDI_BLUE, 0, op, op->msg); 1128 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155 1129
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 1130 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1157 return 0; 1131 return 0;
1158} 1132}
1159 1133
1160int 1134int
1161key_confirm_quit (object *op, char key) 1135key_confirm_quit (object *op, char key)
… …
1875 } 1849 }
1876 1850
1877 /* this should not happen, but sometimes does */ 1851 /* this should not happen, but sometimes does */
1878 if (arrow->nrof == 0) 1852 if (arrow->nrof == 0)
1879 { 1853 {
1880 remove_ob (arrow); 1854 arrow->destroy ();
1881 free_object (arrow);
1882 return 0; 1855 return 0;
1883 } 1856 }
1884 1857
1885 left = arrow; /* these are arrows left to the player */ 1858 left = arrow; /* these are arrows left to the player */
1886 arrow = get_split_ob (arrow, 1); 1859 arrow = get_split_ob (arrow, 1);
1887 if (arrow == NULL) 1860 if (arrow == NULL)
1888 { 1861 {
1889 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1862 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1890 return 0; 1863 return 0;
1891 } 1864 }
1892 set_owner (arrow, op); 1865 arrow->set_owner (op);
1893 arrow->skill = bow->skill; 1866 arrow->skill = bow->skill;
1894 1867
1895 arrow->direction = dir; 1868 arrow->direction = dir;
1896 arrow->x = sx; 1869 arrow->x = sx;
1897 arrow->y = sy; 1870 arrow->y = sy;
… …
1905 SET_ANIMATION (arrow, arrow->direction); 1878 SET_ANIMATION (arrow, arrow->direction);
1906 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1879 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1907 arrow->stats.hp = arrow->stats.dam; 1880 arrow->stats.hp = arrow->stats.dam;
1908 arrow->stats.grace = arrow->attacktype; 1881 arrow->stats.grace = arrow->attacktype;
1909 if (arrow->slaying != NULL) 1882 if (arrow->slaying != NULL)
1910 arrow->spellarg = strdup_local (arrow->slaying); 1883 arrow->spellarg = strdup (arrow->slaying);
1911 1884
1912 /* Note that this was different for monsters - they got their level 1885 /* Note that this was different for monsters - they got their level
1913 * added to the damage. I think the strength bonus is more proper. 1886 * added to the damage. I think the strength bonus is more proper.
1914 */ 1887 */
1915 1888
… …
2105 case range_misc: 2078 case range_misc:
2106 fire_misc_object (op, dir); 2079 fire_misc_object (op, dir);
2107 return; 2080 return;
2108 2081
2109 case range_golem: /* Control summoned monsters from scrolls */ 2082 case range_golem: /* Control summoned monsters from scrolls */
2110 if (op->contr->ranges[range_golem] == NULL || op->contr->golem_count != op->contr->ranges[range_golem]->count) 2083 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2111 { 2084 {
2112 op->contr->ranges[range_golem] = NULL; 2085 op->contr->ranges[range_golem] = 0;
2113 op->contr->shoottype = range_none; 2086 op->contr->shoottype = range_none;
2114 op->contr->golem_count = 0;
2115 } 2087 }
2116 else 2088 else
2117 control_golem (op->contr->ranges[range_golem], dir); 2089 control_golem (op->contr->ranges[range_golem], dir);
2118 return; 2090 return;
2119 2091
… …
2365 * player owns it and it is either friendly or unagressive. 2337 * player owns it and it is either friendly or unagressive.
2366 */ 2338 */
2367 if ((op->type == PLAYER) 2339 if ((op->type == PLAYER)
2368#if COZY_SERVER 2340#if COZY_SERVER
2369 && 2341 &&
2370 ((get_owner (mon) && get_owner (mon)->contr 2342 ((mon->owner && mon->owner->contr
2371 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op) 2343 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2372#else 2344#else
2373 && get_owner (mon) == op 2345 && mon->owner == op
2374#endif 2346#endif
2375 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2347 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2376 { 2348 {
2377 /* If we're braced, we don't want to switch places with it */ 2349 /* If we're braced, we don't want to switch places with it */
2378 if (op->contr->braced) 2350 if (op->contr->braced)
… …
2565 /* I've been seeing crashes where the golem has been destroyed, but 2537 /* I've been seeing crashes where the golem has been destroyed, but
2566 * the player object still points to the defunct golem. The code that 2538 * the player object still points to the defunct golem. The code that
2567 * destroys the golem looks correct, and it doesn't always happen, so 2539 * destroys the golem looks correct, and it doesn't always happen, so
2568 * put this in a a workaround to clean up the golem pointer. 2540 * put this in a a workaround to clean up the golem pointer.
2569 */ 2541 */
2570 if (op->contr->ranges[range_golem] &&
2571 ((op->contr->golem_count != op->contr->ranges[range_golem]->count) || QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))) 2542 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2572 {
2573 op->contr->ranges[range_golem] = NULL; 2543 op->contr->ranges[range_golem] = 0;
2574 op->contr->golem_count = 0;
2575 }
2576 2544
2577 /* call this here - we also will call this in do_ericserver, but 2545 /* call this here - we also will call this in do_ericserver, but
2578 * the players time has been increased when doericserver has been 2546 * the players time has been increased when doericserver has been
2579 * called, so we recheck it here. 2547 * called, so we recheck it here.
2580 */ 2548 */
2581 HandleClient (&op->contr->socket, op->contr); 2549 op->contr->socket->handle_command ();
2582 if (op->speed_left < 0) 2550 if (op->speed_left < 0)
2583 return 0; 2551 return 0;
2584 2552
2585 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2553 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2586 { 2554 {
… …
2595 if (op->speed_left > 0) 2563 if (op->speed_left > 0)
2596 return 1; 2564 return 1;
2597 else 2565 else
2598 return 0; 2566 return 0;
2599 } 2567 }
2568
2600 return 0; 2569 return 0;
2601} 2570}
2602 2571
2603int 2572int
2604save_life (object *op) 2573save_life (object *op)
2605{ 2574{
2606 object *tmp;
2607
2608 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2575 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2609 return 0; 2576 return 0;
2610 2577
2611 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2578 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2612 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2579 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2613 { 2580 {
2614 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2581 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2615 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2582 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2583
2616 if (op->contr) 2584 if (op->contr)
2617 esrv_del_item (op->contr, tmp->count); 2585 esrv_del_item (op->contr, tmp->count);
2618 remove_ob (tmp); 2586
2619 free_object (tmp); 2587 tmp->destroy ();
2620 CLEAR_FLAG (op, FLAG_LIFESAVE); 2588 CLEAR_FLAG (op, FLAG_LIFESAVE);
2589
2621 if (op->stats.hp < 0) 2590 if (op->stats.hp < 0)
2622 op->stats.hp = op->stats.maxhp; 2591 op->stats.hp = op->stats.maxhp;
2592
2623 if (op->stats.food < 0) 2593 if (op->stats.food < 0)
2624 op->stats.food = 999; 2594 op->stats.food = 999;
2595
2625 fix_player (op); 2596 fix_player (op);
2626 return 1; 2597 return 1;
2627 } 2598 }
2599
2628 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2600 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2629 CLEAR_FLAG (op, FLAG_LIFESAVE); 2601 CLEAR_FLAG (op, FLAG_LIFESAVE);
2630 enter_player_savebed (op); /* bring him home. */ 2602 enter_player_savebed (op); /* bring him home. */
2631 return 0; 2603 return 0;
2632} 2604}
… …
2646 next = op->below; /* Make sure we have a good value, in case 2618 next = op->below; /* Make sure we have a good value, in case
2647 * we remove object 'op' 2619 * we remove object 'op'
2648 */ 2620 */
2649 if (QUERY_FLAG (op, FLAG_UNPAID)) 2621 if (QUERY_FLAG (op, FLAG_UNPAID))
2650 { 2622 {
2651 remove_ob (op); 2623 op->remove ();
2652 op->x = env->x; 2624 op->x = env->x;
2653 op->y = env->y; 2625 op->y = env->y;
2654 if (env->type == PLAYER) 2626 if (env->type == PLAYER)
2655 esrv_del_item (env->contr, op->count); 2627 esrv_del_item (env->contr, op->count);
2656 insert_ob_in_map (op, env->map, NULL, 0); 2628 insert_ob_in_map (op, env->map, NULL, 0);
2657 } 2629 }
2658 else if (op->inv) 2630 else if (op->inv)
2659 remove_unpaid_objects (op->inv, env); 2631 remove_unpaid_objects (op->inv, env);
2632
2660 op = next; 2633 op = next;
2661 } 2634 }
2662} 2635}
2663 2636
2664 2637
… …
2679 strcpy (buf2, " R.I.P.\n\n"); 2652 strcpy (buf2, " R.I.P.\n\n");
2680 if (op->type == PLAYER) 2653 if (op->type == PLAYER)
2681 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2654 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2682 else 2655 else
2683 sprintf (buf, "%s\n", &op->name); 2656 sprintf (buf, "%s\n", &op->name);
2657
2684 strncat (buf2, " ", 20 - strlen (buf) / 2); 2658 strncat (buf2, " ", 20 - strlen (buf) / 2);
2685 strcat (buf2, buf); 2659 strcat (buf2, buf);
2686 if (op->type == PLAYER) 2660 if (op->type == PLAYER)
2687 sprintf (buf, "who was in level %d when killed\n", op->level); 2661 sprintf (buf, "who was in level %d when killed\n", op->level);
2688 else 2662 else
2689 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2663 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2664
2690 strncat (buf2, " ", 20 - strlen (buf) / 2); 2665 strncat (buf2, " ", 20 - strlen (buf) / 2);
2691 strcat (buf2, buf); 2666 strcat (buf2, buf);
2692 if (op->type == PLAYER) 2667 if (op->type == PLAYER)
2693 { 2668 {
2694 sprintf (buf, "by %s.\n\n", op->contr->killer); 2669 sprintf (buf, "by %s.\n\n", op->contr->killer);
2695 strncat (buf2, " ", 21 - strlen (buf) / 2); 2670 strncat (buf2, " ", 21 - strlen (buf) / 2);
2696 strcat (buf2, buf); 2671 strcat (buf2, buf);
2697 } 2672 }
2673
2698 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2674 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2699 strncat (buf2, " ", 20 - strlen (buf) / 2); 2675 strncat (buf2, " ", 20 - strlen (buf) / 2);
2700 strcat (buf2, buf); 2676 strcat (buf2, buf);
2677
2701 return buf2; 2678 return buf2;
2702} 2679}
2703 2680
2704 2681
2705 2682
… …
2953 /* restore player */ 2930 /* restore player */
2954 at = archetype::find ("poisoning"); 2931 at = archetype::find ("poisoning");
2955 tmp = present_arch_in_ob (at, op); 2932 tmp = present_arch_in_ob (at, op);
2956 if (tmp) 2933 if (tmp)
2957 { 2934 {
2958 remove_ob (tmp); 2935 tmp->destroy ();
2959 free_object (tmp);
2960 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2936 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2961 } 2937 }
2962 2938
2963 at = archetype::find ("confusion"); 2939 at = archetype::find ("confusion");
2964 tmp = present_arch_in_ob (at, op); 2940 tmp = present_arch_in_ob (at, op);
2965 if (tmp) 2941 if (tmp)
2966 { 2942 {
2967 remove_ob (tmp); 2943 tmp->destroy ();
2968 free_object (tmp);
2969 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2944 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2970 } 2945 }
2971 2946
2972 cure_disease (op, 0); /* remove any disease */ 2947 cure_disease (op, 0); /* remove any disease */
2973 op->stats.hp = op->stats.maxhp; 2948 op->stats.hp = op->stats.maxhp;
… …
3183 3158
3184 /* remove any poisoning and confusion the character may be suffering. */ 3159 /* remove any poisoning and confusion the character may be suffering. */
3185 /* restore player */ 3160 /* restore player */
3186 at = archetype::find ("poisoning"); 3161 at = archetype::find ("poisoning");
3187 tmp = present_arch_in_ob (at, op); 3162 tmp = present_arch_in_ob (at, op);
3163
3188 if (tmp) 3164 if (tmp)
3189 { 3165 {
3190 remove_ob (tmp); 3166 tmp->destroy ();
3191 free_object (tmp);
3192 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 3167 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3193 } 3168 }
3194 3169
3195 at = archetype::find ("confusion"); 3170 at = archetype::find ("confusion");
3196 tmp = present_arch_in_ob (at, op); 3171 tmp = present_arch_in_ob (at, op);
3197 if (tmp) 3172 if (tmp)
3198 { 3173 {
3199 remove_ob (tmp); 3174 tmp->destroy ();
3200 free_object (tmp);
3201 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 3175 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3202 } 3176 }
3203 3177
3204 cure_disease (op, 0); /* remove any disease */ 3178 cure_disease (op, 0); /* remove any disease */
3205 3179
… …
3276 op->contr->party = NULL; 3250 op->contr->party = NULL;
3277 if (settings.set_title == TRUE) 3251 if (settings.set_title == TRUE)
3278 op->contr->own_title[0] = '\0'; 3252 op->contr->own_title[0] = '\0';
3279 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf); 3253 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3280 check_score (op); 3254 check_score (op);
3255
3281 if (op->contr->ranges[range_golem] != NULL) 3256 if (op->contr->ranges[range_golem])
3282 { 3257 {
3283 remove_friendly_object (op->contr->ranges[range_golem]); 3258 remove_friendly_object (op->contr->ranges[range_golem]);
3284 remove_ob (op->contr->ranges[range_golem]); 3259 op->contr->ranges[range_golem]->destroy ();
3285 free_object (op->contr->ranges[range_golem]);
3286 op->contr->ranges[range_golem] = NULL; 3260 op->contr->ranges[range_golem] = 0;
3287 op->contr->golem_count = 0;
3288 } 3261 }
3262
3289 loot_object (op); /* Remove some of the items for good */ 3263 loot_object (op); /* Remove some of the items for good */
3290 remove_ob (op); 3264 op->remove ();
3291 op->direction = 0; 3265 op->direction = 0;
3292 3266
3293 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp) 3267 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3294 { 3268 {
3295 delete_character (op->name, 0); 3269 delete_character (op->name, 0);
… …
3348 for (tmp = op->inv; tmp != NULL; tmp = next) 3322 for (tmp = op->inv; tmp != NULL; tmp = next)
3349 { 3323 {
3350 next = tmp->below; 3324 next = tmp->below;
3351 if (tmp->type == EXPERIENCE || tmp->invisible) 3325 if (tmp->type == EXPERIENCE || tmp->invisible)
3352 continue; 3326 continue;
3353 remove_ob (tmp); 3327 tmp->remove ();
3354 tmp->x = op->x, tmp->y = op->y; 3328 tmp->x = op->x, tmp->y = op->y;
3355 if (tmp->type == CONTAINER) 3329 if (tmp->type == CONTAINER)
3356 { /* empty container to ground */ 3330 { /* empty container to ground */
3357 loot_object (tmp); 3331 loot_object (tmp);
3358 } 3332 }
3359 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 3333 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))
3360 { 3334 {
3361 if (tmp->nrof > 1) 3335 if (tmp->nrof > 1)
3362 { 3336 {
3363 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 3337 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3364 free_object (tmp2); 3338 tmp2->destroy ();
3365 insert_ob_in_map (tmp, op->map, NULL, 0); 3339 insert_ob_in_map (tmp, op->map, NULL, 0);
3366 } 3340 }
3367 else 3341 else
3368 free_object (tmp); 3342 tmp->destroy ();
3369 } 3343 }
3370 else 3344 else
3371 insert_ob_in_map (tmp, op->map, NULL, 0); 3345 insert_ob_in_map (tmp, op->map, NULL, 0);
3372 } 3346 }
3373} 3347}
… …
3438 if (op->type == PLAYER) 3412 if (op->type == PLAYER)
3439 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name); 3413 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3440 3414
3441 cast_spell (op, throw_ob, dir, spob, NULL); 3415 cast_spell (op, throw_ob, dir, spob, NULL);
3442 3416
3443 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED)) 3417 throw_ob->destroy ();
3444 remove_ob (throw_ob);
3445 free_object (throw_ob);
3446} 3418}
3447 3419
3448void 3420void
3449make_visible (object *op) 3421make_visible (object *op)
3450{ 3422{
… …
3657 3629
3658 /* only the viewable area the player sees is updated by LOS 3630 /* only the viewable area the player sees is updated by LOS
3659 * code, so we need to restrict ourselves to that range of values 3631 * code, so we need to restrict ourselves to that range of values
3660 * for any meaningful values. 3632 * for any meaningful values.
3661 */ 3633 */
3662 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3634 if (FABS (dx) <= (pl->contr->socket->mapx / 2) &&
3663 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3635 FABS (dy) <= (pl->contr->socket->mapy / 2) &&
3664 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)]) 3636 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)])
3665 return 1; 3637 return 1;
3666 op = op->more; 3638 op = op->more;
3667 } 3639 }
3668 return 0; 3640 return 0;
3669} 3641}

Diff Legend

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