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.41 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.52 by root, Thu Dec 21 23:37:06 2006 UTC

… …
27#include <sounds.h> 27#include <sounds.h>
28#include <living.h> 28#include <living.h>
29#include <object.h> 29#include <object.h>
30#include <spells.h> 30#include <spells.h>
31#include <skills.h> 31#include <skills.h>
32#include <newclient.h>
33 32
34#ifdef COZY_SERVER 33#ifdef COZY_SERVER
35extern int same_party (partylist *a, partylist *b); 34extern int same_party (partylist *a, partylist *b);
36#endif 35#endif
37 36
… …
83 int comp; 82 int comp;
84 int size; 83 int size;
85 84
86 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 85 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
87 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 86 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
88 {
89 return; 87 return;
90 } 88
91 motd[0] = '\0'; 89 motd[0] = '\0';
92 size = 0; 90 size = 0;
91
93 while (fgets (buf, MAX_BUF, fp) != NULL) 92 while (fgets (buf, MAX_BUF, fp) != NULL)
94 { 93 {
95 if (*buf == '#') 94 if (*buf == '#')
96 continue; 95 continue;
96
97 strncat (motd + size, buf, HUGE_BUF - size); 97 strncat (motd + size, buf, HUGE_BUF - size);
98 size += strlen (buf); 98 size += strlen (buf);
99 } 99 }
100
100 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 101 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
101 close_and_delete (fp, comp); 102 close_and_delete (fp, comp);
102} 103}
103 104
104void 105void
… …
110 int comp; 111 int comp;
111 int size; 112 int size;
112 113
113 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 114 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
114 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 115 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
115 {
116 return; 116 return;
117 } 117
118 rules[0] = '\0'; 118 rules[0] = '\0';
119 size = 0; 119 size = 0;
120
120 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp) != NULL)
121 { 122 {
122 if (*buf == '#') 123 if (*buf == '#')
123 continue; 124 continue;
125
124 if (size + strlen (buf) >= HUGE_BUF) 126 if (size + strlen (buf) >= HUGE_BUF)
125 { 127 {
126 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 128 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
127 break; 129 break;
128 } 130 }
131
129 strncat (rules + size, buf, HUGE_BUF - size); 132 strncat (rules + size, buf, HUGE_BUF - size);
130 size += strlen (buf); 133 size += strlen (buf);
131 } 134 }
135
132 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 136 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
133 close_and_delete (fp, comp); 137 close_and_delete (fp, comp);
134} 138}
135 139
136void 140void
… …
144 int size; 148 int size;
145 149
146 sprintf (buf, "%s/%s", settings.confdir, settings.news); 150 sprintf (buf, "%s/%s", settings.confdir, settings.news);
147 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 151 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
148 return; 152 return;
153
149 news[0] = '\0'; 154 news[0] = '\0';
150 subject[0] = '\0'; 155 subject[0] = '\0';
151 size = 0; 156 size = 0;
157
152 while (fgets (buf, MAX_BUF, fp) != NULL) 158 while (fgets (buf, MAX_BUF, fp) != NULL)
153 { 159 {
154 if (*buf == '#') 160 if (*buf == '#')
155 continue; 161 continue;
162
156 if (*buf == '%') 163 if (*buf == '%')
157 { /* send one news */ 164 { /* send one news */
158 if (size > 0) 165 if (size > 0)
159 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 */ 166 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 */
160 strcpy (subject, buf + 1); 167 strcpy (subject, buf + 1);
… …
187 return 0; 194 return 0;
188 195
189 for (; *cp != '\0'; cp++) 196 for (; *cp != '\0'; cp++)
190 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_') 197 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
191 return 0; 198 return 0;
199
192 return 1; 200 return 1;
193} 201}
194 202
195/* This no longer sets the player map. Also, it now updates 203/* This no longer sets the player map. Also, it now updates
196 * all the pointers so the caller doesn't need to do that. 204 * all the pointers so the caller doesn't need to do that.
… …
236 op->direction = 5; /* So player faces south */ 244 op->direction = 5; /* So player faces south */
237 op->stats.wc = 2; 245 op->stats.wc = 2;
238 op->run_away = 25; /* Then we panick... */ 246 op->run_away = 25; /* Then we panick... */
239 247
240 { 248 {
241 int oldmon = p->socket->monitor_spells; // what a hack 249 int oldmon = p->ns->monitor_spells; // what a hack
242 p->socket->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */ 250 p->ns->monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
243 roll_stats (op); 251 roll_stats (op);
244 p->socket->monitor_spells = oldmon; 252 p->ns->monitor_spells = oldmon;
245 } 253 }
246 p->state = ST_ROLL_STAT; 254 p->ns->state = ST_ROLL_STAT;
247 clear_los (op); 255 clear_los (op);
248 256
249 p->gen_sp_armour = 10; 257 p->gen_sp_armour = 10;
250 p->last_speed = -1; 258 p->last_speed = -1;
251 p->shoottype = range_none; 259 p->shoottype = range_none;
… …
255 p->usekeys = containers; 263 p->usekeys = containers;
256 p->last_weapon_sp = -1; 264 p->last_weapon_sp = -1;
257 p->peaceful = 1; /* default peaceful */ 265 p->peaceful = 1; /* default peaceful */
258 p->do_los = 1; 266 p->do_los = 1;
259 p->explore = 0; 267 p->explore = 0;
260 p->no_shout = 0; /* default can shout */
261 268
262 assign (p->title, op->arch->clone.name); 269 assign (p->title, op->arch->clone.name);
263 op->race = op->arch->clone.race; 270 op->race = op->arch->clone.race;
264 271
265 CLEAR_FLAG (op, FLAG_READY_SKILL); 272 CLEAR_FLAG (op, FLAG_READY_SKILL);
… …
279 p->last_resist[i] = -1; 286 p->last_resist[i] = -1;
280 287
281 p->last_stats.exp = -1; 288 p->last_stats.exp = -1;
282 p->last_weight = (uint32) - 1; 289 p->last_weight = (uint32) - 1;
283 290
284 p->socket->update_look = 0; 291 p->ns->update_look = 0;
285 p->socket->look_position = 0; 292 p->ns->look_position = 0;
286 293
287 return p; 294 return p;
288} 295}
289 296
290/* This loads the first map an puts the player on it. */ 297/* This loads the first map an puts the player on it. */
… …
292set_first_map (object *op) 299set_first_map (object *op)
293{ 300{
294 strcpy (op->contr->maplevel, first_map_path); 301 strcpy (op->contr->maplevel, first_map_path);
295 op->x = -1; 302 op->x = -1;
296 op->y = -1; 303 op->y = -1;
297 enter_exit (op, NULL); 304 enter_exit (op, 0);
298} 305}
299 306
300/* Tries to add player on the connection passwd in ns. 307/* Tries to add player on the connection passwd in ns.
301 * All we can really get in this is some settings like host and display 308 * All we can really get in this is some settings like host and display
302 * mode. 309 * mode.
303 */ 310 */
304 311
305int 312int
306add_player (client_socket *ns) 313add_player (client *ns)
307{ 314{
308 player *p = new player; 315 player *p = new player;
309 316
310 p->socket = ns; 317 p->ns = ns;
311 ns->pl = p; 318 ns->pl = p;
312 319
313 p->next = first_player; 320 p->next = first_player;
314 first_player = p; 321 first_player = p;
315 322
… …
320 CLEAR_FLAG (p->ob, FLAG_FRIENDLY); 327 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
321 add_friendly_object (p->ob); 328 add_friendly_object (p->ob);
322 send_rules (p->ob); 329 send_rules (p->ob);
323 send_news (p->ob); 330 send_news (p->ob);
324 display_motd (p->ob); 331 display_motd (p->ob);
332
325 get_name (p->ob); 333 get_name (p->ob);
326 334
327 return 0; 335 return 0;
328} 336}
329 337
… …
341 { 349 {
342 if (at == NULL || at->next == NULL) 350 if (at == NULL || at->next == NULL)
343 at = first_archetype; 351 at = first_archetype;
344 else 352 else
345 at = at->next; 353 at = at->next;
354
346 if (at->clone.type == PLAYER) 355 if (at->clone.type == PLAYER)
347 return at; 356 return at;
357
348 if (at == start) 358 if (at == start)
349 { 359 {
350 LOG (llevError, "No Player archetypes\n"); 360 LOG (llevError, "No Player archetypes\n");
351 exit (-1); 361 exit (-1);
352 } 362 }
353 } 363 }
354} 364}
355
356 365
357object * 366object *
358get_nearest_player (object *mon) 367get_nearest_player (object *mon)
359{ 368{
360 object *op = NULL; 369 object *op = NULL;
… …
689 698
690void 699void
691get_name (object *op) 700get_name (object *op)
692{ 701{
693 op->contr->write_buf[0] = '\0'; 702 op->contr->write_buf[0] = '\0';
694 op->contr->state = ST_GET_NAME; 703 op->contr->ns->state = ST_GET_NAME;
695 send_query (op->contr->socket, 0, "What is your name?\n:"); 704 send_query (op->contr->ns, 0, "What is your name?\n:");
696} 705}
697 706
698void 707void
699get_password (object *op) 708get_password (object *op)
700{ 709{
701 op->contr->write_buf[0] = '\0'; 710 op->contr->write_buf[0] = '\0';
702 op->contr->state = ST_GET_PASSWORD; 711 op->contr->ns->state = ST_GET_PASSWORD;
703 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:"); 712 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is your password?\n:");
704} 713}
705 714
706void 715void
707play_again (object *op) 716play_again (object *op)
708{ 717{
709 op->contr->state = ST_PLAY_AGAIN; 718 op->contr->ns->state = ST_PLAY_AGAIN;
710 op->chosen_skill = NULL; 719 op->chosen_skill = NULL;
711 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?"); 720 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
712 /* a bit of a hack, but there are various places early in th 721 /* a bit of a hack, but there are various places early in th
713 * player creation process that a user can quit (eg, roll 722 * player creation process that a user can quit (eg, roll
714 * stats) that isn't removing the player. Taking a quick 723 * stats) that isn't removing the player. Taking a quick
715 * look, there are many places that call play_again without 724 * look, there are many places that call play_again without
716 * removing the player - it probably makes more sense 725 * removing the player - it probably makes more sense
717 * to leave it to play_again to remove the object in all 726 * to leave it to play_again to remove the object in all
718 * cases. 727 * cases.
719 */ 728 */
720 if (!QUERY_FLAG (op, FLAG_REMOVED)) 729 if (!QUERY_FLAG (op, FLAG_REMOVED))
721 op->remove (); 730 op->remove ();
731
722 /* Need to set this to null - otherwise, it could point to garbage, 732 /* Need to set this to null - otherwise, it could point to garbage,
723 * and draw() doesn't check to see if the player is removed, only if 733 * and draw() doesn't check to see if the player is removed, only if
724 * the map is null or not swapped out. 734 * the map is null or not swapped out.
725 */ 735 */
726 op->map = NULL; 736 op->map = NULL;
… …
764void 774void
765confirm_password (object *op) 775confirm_password (object *op)
766{ 776{
767 777
768 op->contr->write_buf[0] = '\0'; 778 op->contr->write_buf[0] = '\0';
769 op->contr->state = ST_CONFIRM_PASSWORD; 779 op->contr->ns->state = ST_CONFIRM_PASSWORD;
770 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:"); 780 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
771} 781}
772 782
773void 783void
774get_party_password (object *op, partylist *party) 784get_party_password (object *op, partylist *party)
775{ 785{
… …
777 { 787 {
778 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 788 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
779 return; 789 return;
780 } 790 }
781 op->contr->write_buf[0] = '\0'; 791 op->contr->write_buf[0] = '\0';
782 op->contr->state = ST_GET_PARTY_PASSWORD; 792 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
783 op->contr->party_to_join = party; 793 op->contr->party_to_join = party;
784 send_query (op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 794 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
785} 795}
786 796
787 797
788/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 798/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
789int 799int
… …
886 896
887void 897void
888Roll_Again (object *op) 898Roll_Again (object *op)
889{ 899{
890 esrv_new_player (op->contr, 0); 900 esrv_new_player (op->contr, 0);
891 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, 901 send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
892 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 902 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
893} 903}
894 904
895void 905void
896Swap_Stat (object *op, int Swap_Second) 906Swap_Stat (object *op, int Swap_Second)
… …
963 new_draw_info (NDI_UNIQUE, 0, op, buf); 973 new_draw_info (NDI_UNIQUE, 0, op, buf);
964 } 974 }
965 else 975 else
966 Swap_Stat (op, stat_trans[keynum]); 976 Swap_Stat (op, stat_trans[keynum]);
967 977
968 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, ""); 978 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
969 return 1; 979 return 1;
970 } 980 }
971 switch (key) 981 switch (key)
972 { 982 {
973 case 'n': 983 case 'n':
… …
987 enter_exit (op, NULL); 997 enter_exit (op, NULL);
988#endif 998#endif
989 SET_ANIMATION (op, 2); /* So player faces south */ 999 SET_ANIMATION (op, 2); /* So player faces south */
990 /* Enter exit adds a player otherwise */ 1000 /* Enter exit adds a player otherwise */
991 add_statbonus (op); 1001 add_statbonus (op);
992 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, 1002 send_query (op->contr->ns, CS_QUERY_SINGLECHAR,
993 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 1003 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
994 op->contr->state = ST_CHANGE_CLASS; 1004 op->contr->ns->state = ST_CHANGE_CLASS;
995 if (op->msg) 1005 if (op->msg)
996 new_draw_info (NDI_BLUE, 0, op, op->msg); 1006 new_draw_info (NDI_BLUE, 0, op, op->msg);
997 return 0; 1007 return 0;
998 } 1008 }
999 case 'y': 1009 case 'y':
1000 case 'Y': 1010 case 'Y':
1001 roll_stats (op); 1011 roll_stats (op);
1002 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, ""); 1012 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "");
1003 return 1; 1013 return 1;
1004 1014
1005 case 'q': 1015 case 'q':
1006 case 'Q': 1016 case 'Q':
1007 play_again (op); 1017 play_again (op);
1008 return 1; 1018 return 1;
1009 1019
1010 default: 1020 default:
1011 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?"); 1021 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1012 return 0; 1022 return 0;
1013 } 1023 }
1014 return 0; 1024 return 0;
1015} 1025}
1016 1026
… …
1044 create_treasure (tl, op, 0, 0, 0); 1054 create_treasure (tl, op, 0, 0, 0);
1045 1055
1046 INVOKE_PLAYER (BIRTH, op->contr); 1056 INVOKE_PLAYER (BIRTH, op->contr);
1047 INVOKE_PLAYER (LOGIN, op->contr); 1057 INVOKE_PLAYER (LOGIN, op->contr);
1048 1058
1049 op->contr->state = ST_PLAYING; 1059 op->contr->ns->state = ST_PLAYING;
1050 1060
1051 if (op->msg) 1061 if (op->msg)
1052 op->msg = NULL; 1062 op->msg = NULL;
1053 1063
1054 /* We create this now because some of the unique maps will need it 1064 /* We create this now because some of the unique maps will need it
… …
1084 * if the map isn't there, then stay on the 1094 * if the map isn't there, then stay on the
1085 * default initial map */ 1095 * default initial map */
1086 tmp->destroy (); 1096 tmp->destroy ();
1087 } 1097 }
1088 else 1098 else
1089 {
1090 LOG (llevDebug, "first_map_ext_path not set\n"); 1099 LOG (llevDebug, "first_map_ext_path not set\n");
1091 } 1100
1092 return 0; 1101 return 0;
1093 } 1102 }
1094 1103
1095 /* Following actually changes the race - this is the default command 1104 /* Following actually changes the race - this is the default command
1096 * if we don't match with one of the options above. 1105 * if we don't match with one of the options above.
… …
1126 op->stats.grace = 0; 1135 op->stats.grace = 0;
1127 1136
1128 if (op->msg) 1137 if (op->msg)
1129 new_draw_info (NDI_BLUE, 0, op, op->msg); 1138 new_draw_info (NDI_BLUE, 0, op, op->msg);
1130 1139
1131 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 1140 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1132 return 0; 1141 return 0;
1133} 1142}
1134 1143
1135int 1144int
1136key_confirm_quit (object *op, char key) 1145key_confirm_quit (object *op, char key)
1137{ 1146{
1138 char buf[MAX_BUF]; 1147 char buf[MAX_BUF];
1139 1148
1140 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q') 1149 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1141 { 1150 {
1142 op->contr->state = ST_PLAYING; 1151 op->contr->ns->state = ST_PLAYING;
1143 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play."); 1152 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1144 return 1; 1153 return 1;
1145 } 1154 }
1146 1155
1147 INVOKE_PLAYER (LOGOUT, op->contr); 1156 INVOKE_PLAYER (LOGOUT, op->contr);
… …
1216 { 1225 {
1217 op->enemy = NULL; 1226 op->enemy = NULL;
1218 CLEAR_FLAG (op, FLAG_SCARED); 1227 CLEAR_FLAG (op, FLAG_SCARED);
1219 return; 1228 return;
1220 } 1229 }
1230
1221 get_rangevector (op, op->enemy, &rv, 0); 1231 get_rangevector (op, op->enemy, &rv, 0);
1222 1232
1223 dir = absdir (4 + rv.direction); 1233 dir = absdir (4 + rv.direction);
1224 for (diff = 0; diff < 3; diff++) 1234 for (diff = 0; diff < 3; diff++)
1225 { 1235 {
1226 int m = 1 - (RANDOM () & 2); 1236 int m = 1 - (RANDOM () & 2);
1227 1237
1228 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 1238 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1229 {
1230 return; 1239 return;
1231 }
1232 } 1240 }
1241
1233 /* Cornered, get rid of scared */ 1242 /* Cornered, get rid of scared */
1234 CLEAR_FLAG (op, FLAG_SCARED); 1243 CLEAR_FLAG (op, FLAG_SCARED);
1235 op->enemy = NULL; 1244 op->enemy = NULL;
1236} 1245}
1237 1246
… …
1793 if (!dir) 1802 if (!dir)
1794 { 1803 {
1795 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1804 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1796 return 0; 1805 return 0;
1797 } 1806 }
1807
1798 if (op->type == PLAYER) 1808 if (op->type == PLAYER)
1799 bow = op->contr->ranges[range_bow]; 1809 bow = op->contr->ranges[range_bow];
1800 else 1810 else
1801 { 1811 {
1802 for (bow = op->inv; bow; bow = bow->below) 1812 for (bow = op->inv; bow; bow = bow->below)
… …
1810 { 1820 {
1811 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1821 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1812 return 0; 1822 return 0;
1813 } 1823 }
1814 } 1824 }
1825
1815 if (!bow->race || !bow->skill) 1826 if (!bow->race || !bow->skill)
1816 { 1827 {
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1828 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1818 return 0; 1829 return 0;
1819 } 1830 }
… …
1821 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1832 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1822 1833
1823 /* penalize ROF for bestarrow */ 1834 /* penalize ROF for bestarrow */
1824 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1835 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1825 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1836 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1837
1826 if (bowspeed < 1) 1838 if (bowspeed < 1)
1827 bowspeed = 1; 1839 bowspeed = 1;
1828 1840
1829 if (arrow == NULL) 1841 if (arrow == NULL)
1830 { 1842 {
… …
1836 else 1848 else
1837 CLEAR_FLAG (op, FLAG_READY_BOW); 1849 CLEAR_FLAG (op, FLAG_READY_BOW);
1838 return 0; 1850 return 0;
1839 } 1851 }
1840 } 1852 }
1853
1841 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1854 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1842 if (mflags & P_OUT_OF_MAP) 1855 if (mflags & P_OUT_OF_MAP)
1843 {
1844 return 0; 1856 return 0;
1845 } 1857
1846 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1858 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1847 { 1859 {
1848 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1860 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1849 return 0; 1861 return 0;
1850 } 1862 }
… …
1856 return 0; 1868 return 0;
1857 } 1869 }
1858 1870
1859 left = arrow; /* these are arrows left to the player */ 1871 left = arrow; /* these are arrows left to the player */
1860 arrow = get_split_ob (arrow, 1); 1872 arrow = get_split_ob (arrow, 1);
1861 if (arrow == NULL) 1873 if (!arrow)
1862 { 1874 {
1863 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1875 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1864 return 0; 1876 return 0;
1865 } 1877 }
1878
1866 arrow->set_owner (op); 1879 arrow->set_owner (op);
1867 arrow->skill = bow->skill; 1880 arrow->skill = bow->skill;
1868 1881
1869 arrow->direction = dir; 1882 arrow->direction = dir;
1870 arrow->x = sx; 1883 arrow->x = sx;
… …
1913 } 1926 }
1914 1927
1915 if (arrow->attacktype == AT_PHYSICAL) 1928 if (arrow->attacktype == AT_PHYSICAL)
1916 arrow->attacktype |= bow->attacktype; 1929 arrow->attacktype |= bow->attacktype;
1917 1930
1918 if (bow->slaying != NULL) 1931 if (bow->slaying)
1919 arrow->slaying = bow->slaying; 1932 arrow->slaying = bow->slaying;
1920 1933
1921 arrow->map = m; 1934 arrow->map = m;
1922 arrow->move_type = MOVE_FLY_LOW; 1935 arrow->move_type = MOVE_FLY_LOW;
1923 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1936 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
2039 CLEAR_FLAG (item, FLAG_ANIMATE); 2052 CLEAR_FLAG (item, FLAG_ANIMATE);
2040 item->face = item->arch->clone.face; 2053 item->face = item->arch->clone.face;
2041 item->speed = 0; 2054 item->speed = 0;
2042 update_ob_speed (item); 2055 update_ob_speed (item);
2043 } 2056 }
2044 if ((tmp = is_player_inv (item))) 2057 if ((tmp = item->in_player ()))
2045 esrv_update_item (UPD_ANIM, tmp, item); 2058 esrv_update_item (UPD_ANIM, tmp, item);
2046 } 2059 }
2047 } 2060 }
2048 else if (item->type == ROD || item->type == HORN) 2061 else if (item->type == ROD || item->type == HORN)
2049 { 2062 {
… …
2199 * 0 otherwise 2212 * 0 otherwise
2200 */ 2213 */
2201static int 2214static int
2202player_attack_door (object *op, object *door) 2215player_attack_door (object *op, object *door)
2203{ 2216{
2204
2205 /* If its a door, try to find a use a key. If we do destroy the door, 2217 /* If its a door, try to find a use a key. If we do destroy the door,
2206 * might as well return immediately as there is nothing more to do - 2218 * might as well return immediately as there is nothing more to do -
2207 * otherwise, we fall through to the rest of the code. 2219 * otherwise, we fall through to the rest of the code.
2208 */ 2220 */
2209 object *key = find_key (op, op, door); 2221 object *key = find_key (op, op, door);
… …
2247 * It should keep the code cleaner. 2259 * It should keep the code cleaner.
2248 * When this is called, the players direction has been updated 2260 * When this is called, the players direction has been updated
2249 * (taking into account confusion.) The player is also actually 2261 * (taking into account confusion.) The player is also actually
2250 * going to try and move (not fire weapons). 2262 * going to try and move (not fire weapons).
2251 */ 2263 */
2252
2253void 2264void
2254move_player_attack (object *op, int dir) 2265move_player_attack (object *op, int dir)
2255{ 2266{
2256 object *tmp, *mon; 2267 object *tmp, *mon;
2257 sint16 nx, ny; 2268 sint16 nx, ny;
… …
2259 maptile *m; 2270 maptile *m;
2260 2271
2261 nx = freearr_x[dir] + op->x; 2272 nx = freearr_x[dir] + op->x;
2262 ny = freearr_y[dir] + op->y; 2273 ny = freearr_y[dir] + op->y;
2263 2274
2264 on_battleground = op_on_battleground (op, NULL, NULL); 2275 on_battleground = op_on_battleground (op, 0, 0);
2265 2276
2266 /* If braced, or can't move to the square, and it is not out of the 2277 /* If braced, or can't move to the square, and it is not out of the
2267 * map, attack it. Note order of if statement is important - don't 2278 * map, attack it. Note order of if statement is important - don't
2268 * want to be calling move_ob if braced, because move_ob will move the 2279 * want to be calling move_ob if braced, because move_ob will move the
2269 * player. This is a pretty nasty hack, because if we could 2280 * player. This is a pretty nasty hack, because if we could
… …
2281 return; /* Don't think this should happen */ 2292 return; /* Don't think this should happen */
2282 } 2293 }
2283 else 2294 else
2284 m = op->map; 2295 m = op->map;
2285 2296
2286 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2297 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2287 { 2298 {
2288 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */ 2299 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2289 return; 2300 return;
2290 } 2301 }
2291 2302
2292 mon = NULL; 2303 mon = 0;
2293 /* Go through all the objects, and find ones of interest. Only stop if 2304 /* Go through all the objects, and find ones of interest. Only stop if
2294 * we find a monster - that is something we know we want to attack. 2305 * we find a monster - that is something we know we want to attack.
2295 * if its a door or barrel (can roll) see if there may be monsters 2306 * if its a door or barrel (can roll) see if there may be monsters
2296 * on the space 2307 * on the space
2297 */ 2308 */
2298 while (tmp != NULL) 2309 while (tmp)
2299 { 2310 {
2300 if (tmp == op) 2311 if (tmp == op)
2301 { 2312 {
2302 tmp = tmp->above; 2313 tmp = tmp->above;
2303 continue; 2314 continue;
… …
2313 mon = tmp; 2324 mon = tmp;
2314 2325
2315 tmp = tmp->above; 2326 tmp = tmp->above;
2316 } 2327 }
2317 2328
2318 if (mon == NULL) /* This happens anytime the player tries to move */ 2329 if (!mon) /* This happens anytime the player tries to move */
2319 return; /* into a wall */ 2330 return; /* into a wall */
2320 2331
2321 if (mon->head != NULL) 2332 if (mon->head)
2322 mon = mon->head; 2333 mon = mon->head;
2323 2334
2324 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2335 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2325 if (player_attack_door (op, mon)) 2336 if (player_attack_door (op, mon))
2326 return; 2337 return;
… …
2363 * attack them either. 2374 * attack them either.
2364 */ 2375 */
2365 if ((mon->type == PLAYER || mon->enemy != op) && 2376 if ((mon->type == PLAYER || mon->enemy != op) &&
2366 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2377 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2367#ifdef PROHIBIT_PLAYERKILL 2378#ifdef PROHIBIT_PLAYERKILL
2368 (op->contr->peaceful 2379 (op->contr->peaceful
2369 || (mon->type == PLAYER 2380 || (mon->type == PLAYER
2370 && mon->contr-> 2381 && mon->contr->
2371 peaceful)) && 2382 peaceful)) &&
2372#else 2383#else
2373 op->contr->peaceful && 2384 op->contr->peaceful &&
2374#endif 2385#endif
2375 !on_battleground)) 2386 !on_battleground))
2376 { 2387 {
2377 if (!op->contr->braced) 2388 if (!op->contr->braced)
2378 { 2389 {
2379 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2390 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2380 (void) push_ob (mon, dir, op); 2391 (void) push_ob (mon, dir, op);
2381 } 2392 }
2382 else 2393 else
2383 {
2384 new_draw_info (0, 0, op, "You withhold your attack"); 2394 new_draw_info (0, 0, op, "You withhold your attack");
2385 } 2395
2386 if (op->contr->tmp_invis || op->hide) 2396 if (op->contr->tmp_invis || op->hide)
2387 make_visible (op); 2397 make_visible (op);
2388 } 2398 }
2389 2399
2390 /* If the object is a boulder or other rollable object, then 2400 /* If the object is a boulder or other rollable object, then
… …
2418 op->speed_left += op->speed / op->contr->weapon_sp; 2428 op->speed_left += op->speed / op->contr->weapon_sp;
2419 2429
2420 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2430 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2421 } 2431 }
2422 2432
2423 skill_attack (mon, op, 0, NULL, NULL); 2433 skill_attack (mon, op, 0, 0, 0);
2424 2434
2425 /* If attacking another player, that player gets automatic 2435 /* If attacking another player, that player gets automatic
2426 * hitback, and doesn't loose luck either. 2436 * hitback, and doesn't loose luck either.
2427 * Disable hitback on the battleground or if the target is 2437 * Disable hitback on the battleground or if the target is
2428 * the wiz. 2438 * the wiz.
… …
2430 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ)) 2440 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2431 { 2441 {
2432 short luck = mon->stats.luck; 2442 short luck = mon->stats.luck;
2433 2443
2434 mon->contr->has_hit = 1; 2444 mon->contr->has_hit = 1;
2435 skill_attack (op, mon, 0, NULL, NULL); 2445 skill_attack (op, mon, 0, 0, 0);
2436 mon->stats.luck = luck; 2446 mon->stats.luck = luck;
2437 } 2447 }
2448
2438 if (action_makes_visible (op)) 2449 if (action_makes_visible (op))
2439 make_visible (op); 2450 make_visible (op);
2440 } 2451 }
2441 } /* if player should attack something */ 2452 } /* if player should attack something */
2442} 2453}
… …
2477 2488
2478 /* Add special check for newcs players and fire on - this way, the 2489 /* Add special check for newcs players and fire on - this way, the
2479 * server can handle repeat firing. 2490 * server can handle repeat firing.
2480 */ 2491 */
2481 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2492 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2482 {
2483 op->direction = dir; 2493 op->direction = dir;
2484 }
2485 else 2494 else
2486 {
2487 op->direction = 0; 2495 op->direction = 0;
2488 } 2496
2489 /* Update how the player looks. Use the facing, so direction may 2497 /* Update how the player looks. Use the facing, so direction may
2490 * get reset to zero. This allows for full animation capabilities 2498 * get reset to zero. This allows for full animation capabilities
2491 * for players. 2499 * for players.
2492 */ 2500 */
2493 animate_object (op, op->facing); 2501 animate_object (op, op->facing);
… …
2545 2553
2546 /* call this here - we also will call this in do_ericserver, but 2554 /* call this here - we also will call this in do_ericserver, but
2547 * the players time has been increased when doericserver has been 2555 * the players time has been increased when doericserver has been
2548 * called, so we recheck it here. 2556 * called, so we recheck it here.
2549 */ 2557 */
2550 HandleClient (op->contr->socket, op->contr); 2558 //TODO: better than handling 8 commands, use some more intelligent rate-limiting
2559 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2560 ;
2561
2551 if (op->speed_left < 0) 2562 if (op->speed_left < 0)
2552 return 0; 2563 return 0;
2553 2564
2554 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2565 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2555 { 2566 {
… …
2700 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2711 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2701 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2712 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2702 flush_output_element (op, &op->contr->outputs[i]); 2713 flush_output_element (op, &op->contr->outputs[i]);
2703 } 2714 }
2704 2715
2705 if (op->contr->state == ST_PLAYING) 2716 if (op->contr->ns->state == ST_PLAYING)
2706 { 2717 {
2707 2718
2708 /* these next three if clauses make it possible to SLOW DOWN 2719 /* these next three if clauses make it possible to SLOW DOWN
2709 hp/grace/spellpoint regeneration. */ 2720 hp/grace/spellpoint regeneration. */
2710 if (op->contr->gen_hp >= 0) 2721 if (op->contr->gen_hp >= 0)
… …
2852 if (!QUERY_FLAG (op, FLAG_WIZ)) 2863 if (!QUERY_FLAG (op, FLAG_WIZ))
2853 op->stats.food--; 2864 op->stats.food--;
2854 } 2865 }
2855 } 2866 }
2856 2867
2857 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2868 if (op->contr->ns->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)
2858 { 2869 {
2859 object *tmp, *flesh = NULL; 2870 object *tmp, *flesh = NULL;
2860 2871
2861 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2872 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2862 { 2873 {
… …
2884 } /* end if player is starving */ 2895 } /* end if player is starving */
2885 2896
2886 while (op->stats.food < 0 && op->stats.hp > 0) 2897 while (op->stats.food < 0 && op->stats.hp > 0)
2887 op->stats.food++, op->stats.hp--; 2898 op->stats.food++, op->stats.hp--;
2888 2899
2889 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0)) 2900 if (!op->contr->ns->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
2890 kill_player (op); 2901 kill_player (op);
2891} 2902}
2892 2903
2893 2904
2894 2905
… …
3214 * at his savebed location, and that can have long lasting 3225 * at his savebed location, and that can have long lasting
3215 * spell effects. So first see if there is a spell effect 3226 * spell effects. So first see if there is a spell effect
3216 * on the space that might harm the player. 3227 * on the space that might harm the player.
3217 */ 3228 */
3218 will_kill_again = 0; 3229 will_kill_again = 0;
3219 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 3230 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3220 if (tmp->type == SPELL_EFFECT) 3231 if (tmp->type == SPELL_EFFECT)
3221 will_kill_again |= tmp->attacktype; 3232 will_kill_again |= tmp->attacktype;
3222 3233
3223 if (will_kill_again) 3234 if (will_kill_again)
3224 { 3235 {
… …
3321 } 3332 }
3322 3333
3323 for (tmp = op->inv; tmp != NULL; tmp = next) 3334 for (tmp = op->inv; tmp != NULL; tmp = next)
3324 { 3335 {
3325 next = tmp->below; 3336 next = tmp->below;
3326 if (tmp->type == EXPERIENCE || tmp->invisible) 3337 if (tmp->invisible)
3327 continue; 3338 continue;
3328 tmp->remove (); 3339 tmp->remove ();
3329 tmp->x = op->x, tmp->y = op->y; 3340 tmp->x = op->x, tmp->y = op->y;
3330 if (tmp->type == CONTAINER) 3341 if (tmp->type == CONTAINER)
3331 { /* empty container to ground */ 3342 { /* empty container to ground */
… …
3373fix_luck (void) 3384fix_luck (void)
3374{ 3385{
3375 player *pl; 3386 player *pl;
3376 3387
3377 for (pl = first_player; pl != NULL; pl = pl->next) 3388 for (pl = first_player; pl != NULL; pl = pl->next)
3378 if (!pl->ob->contr->state) 3389 if (!pl->ob->contr->ns->state)
3379 change_luck (pl->ob, 0); 3390 change_luck (pl->ob, 0);
3380} 3391}
3381 3392
3382 3393
3383/* cast_dust() - handles op throwing objects of type 'DUST'. 3394/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3437 object *tmp = NULL; 3448 object *tmp = NULL;
3438 3449
3439 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3450 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3440 return 1; 3451 return 1;
3441 3452
3442 if (op->type == PLAYER)
3443 for (tmp = op->inv; tmp; tmp = tmp->below)
3444 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3445 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3446 return 1;
3447 return 0; 3453 return 0;
3448} 3454}
3449 3455
3450/* look at the surrounding terrain to determine 3456/* look at the surrounding terrain to determine
3451 * the hideability of this object. Positive levels 3457 * the hideability of this object. Positive levels
… …
3566 if (mflags & P_OUT_OF_MAP) 3572 if (mflags & P_OUT_OF_MAP)
3567 continue; 3573 continue;
3568 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3574 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3569 continue; 3575 continue;
3570 3576
3571 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3577 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3572 { 3578 {
3573 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3579 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3574 return 1; 3580 return 1;
3575 else if (tmp->type == PLAYER) 3581 else if (tmp->type == PLAYER)
3576 { 3582 {
… …
3630 3636
3631 /* only the viewable area the player sees is updated by LOS 3637 /* only the viewable area the player sees is updated by LOS
3632 * code, so we need to restrict ourselves to that range of values 3638 * code, so we need to restrict ourselves to that range of values
3633 * for any meaningful values. 3639 * for any meaningful values.
3634 */ 3640 */
3635 if (FABS (dx) <= (pl->contr->socket->mapx / 2) && 3641 if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3636 FABS (dy) <= (pl->contr->socket->mapy / 2) && 3642 FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3637 !pl->contr->blocked_los[dx + (pl->contr->socket->mapx / 2)][dy + (pl->contr->socket->mapy / 2)]) 3643 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3638 return 1; 3644 return 1;
3639 op = op->more; 3645 op = op->more;
3640 } 3646 }
3641 return 0; 3647 return 0;
3642} 3648}
… …
3828 { 3834 {
3829 /* forces in the treasurelist can alter the player's stats */ 3835 /* forces in the treasurelist can alter the player's stats */
3830 object *skin; 3836 object *skin;
3831 3837
3832 /* first get the dragon skin force */ 3838 /* first get the dragon skin force */
3839 shstr_cmp dragon_skin_force ("dragon_skin_force");
3833 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3840 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below)
3841 ;
3842
3834 if (skin == NULL) 3843 if (!skin)
3835 return; 3844 return;
3836 3845
3837 /* adding new spellpath attunements */ 3846 /* adding new spellpath attunements */
3838 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3847 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3839 { 3848 {

Diff Legend

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