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.90 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.110 by root, Mon Apr 16 06:23:43 2007 UTC

… …
116 116
117 news[0] = '\0'; 117 news[0] = '\0';
118 subject[0] = '\0'; 118 subject[0] = '\0';
119 size = 0; 119 size = 0;
120 120
121 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp))
122 { 122 {
123 if (*buf == '#') 123 if (*buf == '#')
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
… …
180 180
181 players.insert (this); 181 players.insert (this);
182 ob->remove (); 182 ob->remove ();
183 ob->map = 0; 183 ob->map = 0;
184 ob->activate_recursive (); 184 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob);
185 enter_map (); 187 enter_map ();
186} 188}
187 189
188void 190void
189player::deactivate () 191player::deactivate ()
190{ 192{
191 if (!active) 193 if (!active)
192 return; 194 return;
193 195
194 terminate_all_pets (ob); 196 terminate_all_pets (ob);
197 remove_friendly_object (ob);
195 ob->deactivate_recursive (); 198 ob->deactivate_recursive ();
199 maplevel = ob->map->path;
196 ob->remove (); 200 ob->remove ();
197 ob->map = 0; 201 ob->map = 0;
202 party = 0;
203
204 // for weird reasons, this is often "ob", keeping a circular reference
205 ranges [range_skill] = 0;
198 206
199 players.erase (this); 207 players.erase (this);
200} 208}
201 209
202// connect the player with a specific client 210// connect the player with a specific client
… …
205player::connect (client *ns) 213player::connect (client *ns)
206{ 214{
207 this->ns = ns; 215 this->ns = ns;
208 ns->pl = this; 216 ns->pl = this;
209 217
218 run_on = 0;
219 fire_on = 0;
220 ob->close_container (); //TODO: client-specific
221
210 ns->update_look = 0; 222 ns->update_look = 0;
211 ns->look_position = 0; 223 ns->look_position = 0;
212 224
213 clear_los (ob); 225 clear_los (ob);
226
227 ns->reset_stats ();
214 228
215 /* make sure he's a player -- needed because of class change. */ 229 /* make sure he's a player -- needed because of class change. */
216 ob->type = PLAYER; // we are paranoid 230 ob->type = PLAYER; // we are paranoid
217 ob->race = ob->arch->clone.race; 231 ob->race = ob->arch->clone.race;
218 232
… …
223 link_player_skills (ob); 237 link_player_skills (ob);
224 238
225 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 239 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
226 240
227 assign (title, ob->arch->clone.name); 241 assign (title, ob->arch->clone.name);
228
229 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
230 * from the class, and not race. I don't see any way to get the class information
231 * to then update this. I don't think this will actually break anything - anyone
232 * that can use armour should be able to use a shield. What this may 'break'
233 * are features new characters get, eg, if someone starts up with a Q, they
234 * should be able to use a shield. However, old Q's won't get that advantage.
235 */
236 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
237 SET_FLAG (ob, FLAG_USE_SHIELD);
238 242
239 /* if it's a dragon player, set the correct title here */ 243 /* if it's a dragon player, set the correct title here */
240 if (is_dragon_pl (ob)) 244 if (is_dragon_pl (ob))
241 { 245 {
242 object *tmp, *abil = 0, *skin = 0; 246 object *tmp, *abil = 0, *skin = 0;
… …
252 skin = tmp; 256 skin = tmp;
253 257
254 set_dragon_name (ob, abil, skin); 258 set_dragon_name (ob, abil, skin);
255 } 259 }
256 260
257 CLEAR_FLAG (ob, FLAG_FRIENDLY);
258 add_friendly_object (ob);
259
260 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
261
262 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 261 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
263 262
264 esrv_new_player (this, ob->weight + ob->carrying); 263 esrv_new_player (this, ob->weight + ob->carrying);
265 264
266 ob->update_stats (); 265 ob->update_stats ();
… …
287 if (active) 286 if (active)
288 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); 287 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
289 288
290 INVOKE_PLAYER (DISCONNECT, this); 289 INVOKE_PLAYER (DISCONNECT, this);
291 290
291 ns->reset_stats ();
292 ns->pl = 0; 292 ns->pl = 0;
293 this->ns = 0; 293 this->ns = 0;
294 } 294 }
295
296 if (ob)
297 ob->close_container (); //TODO: client-specific
295 298
296 deactivate (); 299 deactivate ();
297} 300}
298 301
299// the need for this function can be explained 302// the need for this function can be explained
300// by load_object not returning the object 303// by load_object not returning the object
301void 304void
302player::set_object (object *op) 305player::set_object (object *op)
303{ 306{
304 ob = op; 307 ob = op;
305 ob->contr = this; /* this aren't yet in archetype */ 308 ob->contr = this; /* this aren't yet in archetype */
306 309
307 ob->speed_left = 0.5; 310 ob->speed_left = 0.5;
308 ob->speed = 1.0; 311 ob->speed = 1.0;
309 ob->direction = 5; /* So player faces south */ 312 ob->direction = 5; /* So player faces south */
310 ob->stats.wc = 2;
311 ob->run_away = 25; /* Then we panick... */
312
313 ob->roll_stats ();
314} 313}
315 314
316player::player () 315player::player ()
317{ 316{
318 /* There are some elements we want initialised to non zero value - 317 /* There are some elements we want initialised to non zero value -
319 * we deal with that below this point. 318 * we deal with that below this point.
320 */ 319 */
321 outputs_sync = 16; /* Every 2 seconds */ 320 outputs_sync = 6; /* Every 2 seconds */
322 outputs_count = 8; /* Keeps present behaviour */ 321 outputs_count = 10; /* Keeps present behaviour */
323 unapply = unapply_nochoice; 322 unapply = unapply_nochoice;
324 323
325 savebed_map = first_map_path; /* Init. respawn position */ 324 savebed_map = first_map_path; /* Init. respawn position */
326 325
327 gen_sp_armour = 10; 326 gen_sp_armour = 10;
328 last_speed = -1;
329 shoottype = range_none; 327 shoottype = range_none;
330 bowtype = bow_normal; 328 bowtype = bow_normal;
331 petmode = pet_normal; 329 petmode = pet_normal;
332 listening = 10; 330 listening = 10;
333 usekeys = containers; 331 usekeys = containers;
334 last_weapon_sp = -1;
335 peaceful = 1; /* default peaceful */ 332 peaceful = 1; /* default peaceful */
336 do_los = 1; 333 do_los = 1;
337
338 /* we need to clear these to -1 and not zero - otherwise,
339 * if a player quits and starts a new character, we wont
340 * send new values to the client, as things like exp start
341 * at zero.
342 */
343 for (int i = 0; i < NUM_SKILLS; i++)
344 last_skill_exp[i] = -1;
345
346 for (int i = 0; i < NROFATTACKS; i++)
347 last_resist[i] = -1;
348
349 last_stats.exp = -1;
350 last_weight = (uint32) - 1;
351} 334}
352 335
353void 336void
354player::do_destroy () 337player::do_destroy ()
355{ 338{
… …
378player::create () 361player::create ()
379{ 362{
380 player *pl = new player; 363 player *pl = new player;
381 364
382 pl->set_object (arch_to_object (get_player_archetype (0))); 365 pl->set_object (arch_to_object (get_player_archetype (0)));
366
367 pl->ob->roll_stats ();
368 pl->ob->stats.wc = 2;
369 pl->ob->run_away = 25; /* Then we panick... */
370
383 set_first_map (pl->ob); 371 set_first_map (pl->ob);
384 372
385 return pl; 373 return pl;
386} 374}
387 375
… …
419 object *op = NULL; 407 object *op = NULL;
420 objectlink *ol; 408 objectlink *ol;
421 unsigned lastdist; 409 unsigned lastdist;
422 rv_vector rv; 410 rv_vector rv;
423 411
424 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 412 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
425 { 413 {
426 /* We should not find free objects on this friendly list, but it 414 /* We should not find free objects on this friendly list, but it
427 * does periodically happen. Given that, lets deal with it. 415 * does periodically happen. Given that, lets deal with it.
428 * While unlikely, it is possible the next object on the friendly 416 * While unlikely, it is possible the next object on the friendly
429 * list is also free, so encapsulate this in a while loop. 417 * list is also free, so encapsulate this in a while loop.
… …
433 object *tmp = ol->ob; 421 object *tmp = ol->ob;
434 422
435 /* Can't do much more other than log the fact, because the object 423 /* Can't do much more other than log the fact, because the object
436 * itself will have been cleared. 424 * itself will have been cleared.
437 */ 425 */
438 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 426 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
427 tmp->debug_desc ());
439 ol = ol->next; 428 ol = ol->next;
440 remove_friendly_object (tmp); 429 remove_friendly_object (tmp);
441 if (!ol) 430 if (!ol)
442 return op; 431 return op;
443 } 432 }
… …
532 x = mon->x; 521 x = mon->x;
533 y = mon->y; 522 y = mon->y;
534 m = mon->map; 523 m = mon->map;
535 dir = rv.direction; 524 dir = rv.direction;
536 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 525 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
537 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 526 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
527
538 /* If we can't solve it within the search distance, return now. */ 528 /* If we can't solve it within the search distance, return now. */
539 if (diff > max) 529 if (diff > max)
540 return 0; 530 return 0;
531
541 while (diff > 1 && max > 0) 532 while (diff > 1 && max > 0)
542 { 533 {
543 lastx = x; 534 lastx = x;
544 lasty = y; 535 lasty = y;
545 lastmap = m; 536 lastmap = m;
… …
627 max--; 618 max--;
628 lastdir = dir; 619 lastdir = dir;
629 if (!firstdir) 620 if (!firstdir)
630 firstdir = dir; 621 firstdir = dir;
631 } 622 }
623
632 if (diff <= 1) 624 if (diff <= 1)
633 { 625 {
634 /* Recalculate diff (distance) because we may not have actually 626 /* Recalculate diff (distance) because we may not have actually
635 * headed toward player for entire distance. 627 * headed toward player for entire distance.
636 */ 628 */
637 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 629 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
638 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 630 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
639 } 631 }
632
640 if (diff > max) 633 if (diff > max)
641 return 0; 634 return 0;
642 } 635 }
636
643 /* If we reached the max, didn't find a direction in time */ 637 /* If we reached the max, didn't find a direction in time */
644 if (!max) 638 if (!max)
645 return 0; 639 return 0;
646 640
647 return firstdir; 641 return firstdir;
… …
761roll_stat (void) 755roll_stat (void)
762{ 756{
763 int a[4], i, j, k; 757 int a[4], i, j, k;
764 758
765 for (i = 0; i < 4; i++) 759 for (i = 0; i < 4; i++)
766 a[i] = (int) RANDOM () % 6 + 1; 760 a[i] = (int) rndm (6) + 1;
767 761
768 for (i = 0, j = 0, k = 7; i < 4; i++) 762 for (i = 0, j = 0, k = 7; i < 4; i++)
769 if (a[i] < k) 763 if (a[i] < k)
770 k = a[i], j = i; 764 k = a[i], j = i;
771 765
… …
883 char buf[MAX_BUF]; 877 char buf[MAX_BUF];
884 878
885 /* this must before then initial items are given */ 879 /* this must before then initial items are given */
886 esrv_new_player (op->contr, op->weight + op->carrying); 880 esrv_new_player (op->contr, op->weight + op->carrying);
887 881
888 treasurelist *tl = find_treasurelist ("starting_wealth"); 882 treasurelist *tl = treasurelist::find ("starting_wealth");
889 if (tl) 883 if (tl)
890 create_treasure (tl, op, 0, 0, 0); 884 create_treasure (tl, op, 0, 0, 0);
891 885
892 INVOKE_PLAYER (BIRTH, op->contr); 886 INVOKE_PLAYER (BIRTH, op->contr);
893 INVOKE_PLAYER (LOGIN, op->contr); 887 INVOKE_PLAYER (LOGIN, op->contr);
… …
901 * to save here. 895 * to save here.
902 */ 896 */
903 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
904 make_path_to_file (buf); 898 make_path_to_file (buf);
905 899
906#ifdef AUTOSAVE
907 op->contr->last_save_tick = pticks;
908#endif
909 start_info (op); 900 start_info (op);
910 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (op, FLAG_WIZ);
911 give_initial_items (op, op->randomitems); 902 give_initial_items (op, op->randomitems);
912 link_player_skills (op); 903 link_player_skills (op);
913 esrv_send_inventory (op, op); 904 esrv_send_inventory (op, op);
… …
1039int 1030int
1040check_pick (object *op) 1031check_pick (object *op)
1041{ 1032{
1042 object *tmp, *next; 1033 object *tmp, *next;
1043 int stop = 0; 1034 int stop = 0;
1044 int j, k, wvratio; 1035 int wvratio;
1045 char putstring[128], tmpstr[16]; 1036 char putstring[128];
1046 1037
1047 /* if you're flying, you cna't pick up anything */ 1038 /* if you're flying, you cna't pick up anything */
1048 if (op->move_type & MOVE_FLYING) 1039 if (op->move_type & MOVE_FLYING)
1049 return 1; 1040 return 1;
1050 1041
… …
1387 * found object is returned. 1378 * found object is returned.
1388 */ 1379 */
1389object * 1380object *
1390find_arrow (object *op, const char *type) 1381find_arrow (object *op, const char *type)
1391{ 1382{
1392 object *tmp = NULL; 1383 object *tmp = 0;
1393 1384
1394 for (op = op->inv; op; op = op->below) 1385 for (op = op->inv; op; op = op->below)
1395 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1386 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1396 tmp = find_arrow (op, type); 1387 tmp = find_arrow (op, type);
1397 else if (op->type == ARROW && op->race == type) 1388 else if (op->type == ARROW && op->race == type)
1398 return op; 1389 return op;
1390
1399 return tmp; 1391 return tmp;
1400} 1392}
1401 1393
1402/* 1394/*
1403 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1395 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1404 * against the target. A full test is not performed, simply a basic test 1396 * against the target. A full test is not performed, simply a basic test
1405 * of resistances. The archer is making a quick guess at what he sees down 1397 * of resistances. The archer is making a quick guess at what he sees down
1406 * the hall. Failing that it does it's best to pick the highest plus arrow. 1398 * the hall. Failing that it does it's best to pick the highest plus arrow.
1407 */ 1399 */
1408
1409object * 1400object *
1410find_better_arrow (object *op, object *target, const char *type, int *better) 1401find_better_arrow (object *op, object *target, const char *type, int *better)
1411{ 1402{
1412 object *tmp = NULL, *arrow, *ntmp; 1403 object *tmp = NULL, *arrow, *ntmp;
1413 int attacknum, attacktype, betterby = 0, i; 1404 int attacknum, attacktype, betterby = 0, i;
… …
1861 { 1852 {
1862 if (op->type == PLAYER) 1853 if (op->type == PLAYER)
1863 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1864 return; 1855 return;
1865 } 1856 }
1857
1866 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1858 do_skill (op, op, op->chosen_skill, dir, NULL);
1867 return; 1859 return;
1868 case range_builder: 1860 case range_builder:
1869 apply_map_builder (op, dir); 1861 apply_map_builder (op, dir);
1870 return; 1862 return;
1871 default: 1863 default:
1872 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type."); 1864 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1873 return; 1865 return;
1874 } 1866 }
1875} 1867}
1876
1877
1878 1868
1879/* find_key 1869/* find_key
1880 * We try to find a key for the door as passed. If we find a key 1870 * We try to find a key for the door as passed. If we find a key
1881 * and successfully use it, we return the key, otherwise NULL 1871 * and successfully use it, we return the key, otherwise NULL
1882 * This function merges both normal and locked door, since the logic 1872 * This function merges both normal and locked door, since the logic
… …
1884 * pl is the player, 1874 * pl is the player,
1885 * inv is the objects inventory to searched 1875 * inv is the objects inventory to searched
1886 * door is the door we are trying to match against. 1876 * door is the door we are trying to match against.
1887 * This function can be called recursively to search containers. 1877 * This function can be called recursively to search containers.
1888 */ 1878 */
1889
1890object * 1879object *
1891find_key (object *pl, object *container, object *door) 1880find_key (object *pl, object *container, object *door)
1892{ 1881{
1893 object *tmp, *key; 1882 object *tmp, *key;
1894 1883
1895 /* Should not happen, but sanity checking is never bad */ 1884 /* Should not happen, but sanity checking is never bad */
1896 if (container->inv == NULL) 1885 if (!container->inv)
1897 return NULL; 1886 return 0;
1898 1887
1899 /* First, lets try to find a key in the top level inventory */ 1888 /* First, lets try to find a key in the top level inventory */
1900 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1889 for (tmp = container->inv; tmp; tmp = tmp->below)
1901 { 1890 {
1902 if (door->type == DOOR && tmp->type == KEY) 1891 if (door->type == DOOR && tmp->type == KEY)
1903 break; 1892 break;
1904 /* For sanity, we should really check door type, but other stuff 1893 /* For sanity, we should really check door type, but other stuff
1905 * (like containers) can be locked with special keys 1894 * (like containers) can be locked with special keys
1906 */ 1895 */
1907 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1896 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1908 break; 1897 break;
1909 } 1898 }
1899
1910 /* No key found - lets search inventories now */ 1900 /* No key found - lets search inventories now */
1911 /* If we find and use a key in an inventory, return at that time. 1901 /* If we find and use a key in an inventory, return at that time.
1912 * otherwise, if we search all the inventories and still don't find 1902 * otherwise, if we search all the inventories and still don't find
1913 * a key, return 1903 * a key, return
1914 */ 1904 */
1915 if (!tmp) 1905 if (!tmp)
1916 { 1906 {
1917 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1907 for (tmp = container->inv; tmp; tmp = tmp->below)
1918 { 1908 {
1919 /* No reason to search empty containers */ 1909 /* No reason to search empty containers */
1920 if (tmp->type == CONTAINER && tmp->inv) 1910 if (tmp->type == CONTAINER && tmp->inv)
1921 { 1911 {
1922 if ((key = find_key (pl, tmp, door)) != NULL) 1912 if ((key = find_key (pl, tmp, door)))
1923 return key; 1913 return key;
1924 } 1914 }
1925 } 1915 }
1916
1926 if (!tmp) 1917 if (!tmp)
1927 return NULL; 1918 return NULL;
1928 } 1919 }
1920
1929 /* We get down here if we have found a key. Now if its in a container, 1921 /* We get down here if we have found a key. Now if its in a container,
1930 * see if we actually want to use it 1922 * see if we actually want to use it
1931 */ 1923 */
1932 if (pl != container) 1924 if (pl != container)
1933 { 1925 {
… …
1954 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1946 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1955 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1947 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1956 return NULL; 1948 return NULL;
1957 } 1949 }
1958 } 1950 }
1951
1959 return tmp; 1952 return tmp;
1960} 1953}
1961 1954
1962/* moved door processing out of move_player_attack. 1955/* moved door processing out of move_player_attack.
1963 * returns 1 if player has opened the door with a key 1956 * returns 1 if player has opened the door with a key
… …
1981 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1974 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1982 if (action_makes_visible (op)) 1975 if (action_makes_visible (op))
1983 make_visible (op); 1976 make_visible (op);
1984 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1977 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1985 spring_trap (door->inv, op); 1978 spring_trap (door->inv, op);
1979
1986 if (door->type == DOOR) 1980 if (door->type == DOOR)
1987 {
1988 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1981 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1989 }
1990 else if (door->type == LOCKED_DOOR) 1982 else if (door->type == LOCKED_DOOR)
1991 { 1983 {
1992 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1984 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1993 remove_door2 (door); /* remove door without violence ;-) */ 1985 remove_door2 (door); /* remove door without violence ;-) */
1994 } 1986 }
1987
1995 /* Do this after we print the message */ 1988 /* Do this after we print the message */
1996 decrease_ob (key); /* Use up one of the keys */ 1989 decrease_ob (key); /* Use up one of the keys */
1997 /* Need to update the weight the container the key was in */ 1990 /* Need to update the weight the container the key was in */
1998 if (container != op) 1991 if (container != op)
1999 esrv_update_item (UPD_WEIGHT, op, container); 1992 esrv_update_item (UPD_WEIGHT, op, container);
1993
2000 return 1; /* Nothing more to do below */ 1994 return 1; /* Nothing more to do below */
2001 } 1995 }
2002 else if (door->type == LOCKED_DOOR) 1996 else if (door->type == LOCKED_DOOR)
2003 { 1997 {
2004 /* Might as well return now - no other way to open this */ 1998 /* Might as well return now - no other way to open this */
2005 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1999 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2006 return 1; 2000 return 1;
2007 } 2001 }
2002
2008 return 0; 2003 return 0;
2009} 2004}
2010 2005
2011/* This function is just part of a breakup from move_player. 2006/* This function is just part of a breakup from move_player.
2012 * It should keep the code cleaner. 2007 * It should keep the code cleaner.
… …
2218 return 0; 2213 return 0;
2219 } 2214 }
2220 2215
2221 /* peterm: added following line */ 2216 /* peterm: added following line */
2222 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2223 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2224 2219
2225 op->facing = dir; 2220 op->facing = dir;
2226 2221
2227 if (op->hide) 2222 if (op->hide)
2228 do_hidden_move (op); 2223 do_hidden_move (op);
… …
2261 * Returns true if there are more actions we can do. 2256 * Returns true if there are more actions we can do.
2262 */ 2257 */
2263int 2258int
2264handle_newcs_player (object *op) 2259handle_newcs_player (object *op)
2265{ 2260{
2266 if (op->contr->hidden)
2267 {
2268 op->invisible = 1000;
2269 /* the socket code flashes the player visible/invisible
2270 * depending on the value of invisible, so we need to
2271 * alternate it here for it to work correctly.
2272 */
2273 if (pticks & 2)
2274 op->invisible--;
2275 }
2276 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2277 {
2278 op->invisible--;
2279 if (!op->invisible)
2280 {
2281 make_visible (op);
2282 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2283 }
2284 }
2285
2286 if (QUERY_FLAG (op, FLAG_SCARED)) 2261 if (QUERY_FLAG (op, FLAG_SCARED))
2287 { 2262 {
2288 flee_player (op); 2263 flee_player (op);
2289 /* If player is still scared, that is his action for this tick */ 2264 /* If player is still scared, that is his action for this tick */
2290 if (QUERY_FLAG (op, FLAG_SCARED)) 2265 if (QUERY_FLAG (op, FLAG_SCARED))
… …
2369 * from. 2344 * from.
2370 */ 2345 */
2371void 2346void
2372remove_unpaid_objects (object *op, object *env) 2347remove_unpaid_objects (object *op, object *env)
2373{ 2348{
2374 object *next;
2375
2376 while (op) 2349 while (op)
2377 { 2350 {
2378 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2351 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2379 2352
2380 if (QUERY_FLAG (op, FLAG_UNPAID)) 2353 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2446 int rate_grace = 2000; 2419 int rate_grace = 2000;
2447 const int max_hp = 1; 2420 const int max_hp = 1;
2448 const int max_sp = 1; 2421 const int max_sp = 1;
2449 const int max_grace = 1; 2422 const int max_grace = 1;
2450 2423
2424 if (op->contr->hidden)
2425 {
2426 op->invisible = 1000;
2427 /* the socket code flashes the player visible/invisible
2428 * depending on the value of invisible, so we need to
2429 * alternate it here for it to work correctly.
2430 */
2431 if (pticks & 2)
2432 op->invisible--;
2433 }
2434 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2435 {
2436 if (!op->invisible--)
2437 {
2438 make_visible (op);
2439 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2440 }
2441 }
2442
2451 if (op->contr->outputs_sync) 2443 if (op->contr->outputs_sync)
2452 {
2453 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2444 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2454 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2445 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2455 flush_output_element (op, &op->contr->outputs[i]); 2446 flush_output_element (op, &op->contr->outputs[i]);
2456 }
2457 2447
2458 if (op->contr->ns->state == ST_PLAYING) 2448 if (op->contr->ns->state == ST_PLAYING)
2459 { 2449 {
2460 /* these next three if clauses make it possible to SLOW DOWN 2450 /* these next three if clauses make it possible to SLOW DOWN
2461 hp/grace/spellpoint regeneration. */ 2451 hp/grace/spellpoint regeneration. */
… …
2710 tmp->name = buf; 2700 tmp->name = buf;
2711 sprintf (buf, " This finger has been cut off %s\n" 2701 sprintf (buf, " This finger has been cut off %s\n"
2712 " the %s, when he was defeated at\n level %d by %s.\n", 2702 " the %s, when he was defeated at\n level %d by %s.\n",
2713 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2703 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2714 tmp->msg = buf; 2704 tmp->msg = buf;
2715 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2705 tmp->value = 0, tmp->type = 0;
2716 tmp->materialname = NULL; 2706 tmp->materialname = "organics";
2717 tmp->insert_at (op, tmp); 2707 tmp->insert_at (op, tmp);
2718 } 2708 }
2719 2709
2720 /* teleport defeated player to new destination */ 2710 /* teleport defeated player to new destination */
2721 transfer_ob (op, x, y, 0, NULL); 2711 transfer_ob (op, x, y, 0, NULL);
… …
2917 op->stats.hp = op->stats.maxhp; 2907 op->stats.hp = op->stats.maxhp;
2918 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2908 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2919 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2909 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2920 2910
2921 /* 2911 /*
2922 * Check to see if the player is in a shop. IF so, then check to see if
2923 * the player has any unpaid items. If so, remove them and put them back 2912 * Check to see if the player has any unpaid items. If so, remove them
2924 * in the map. 2913 * and put them back in the map.
2925 */ 2914 */
2926
2927 if (is_in_shop (op))
2928 remove_unpaid_objects (op->inv, op); 2915 remove_unpaid_objects (op->inv, op);
2929 2916
2930 /****************************************/ 2917 /****************************************/
2931 /* */ 2918 /* */
2932 /* Move player to his current respawn- */ 2919 /* Move player to his current respawn- */
2933 /* position (usually last savebed) */ 2920 /* position (usually last savebed) */
… …
2973void 2960void
2974loot_object (object *op) 2961loot_object (object *op)
2975{ /* Grab and destroy some treasure */ 2962{ /* Grab and destroy some treasure */
2976 object *tmp, *tmp2, *next; 2963 object *tmp, *tmp2, *next;
2977 2964
2978 if (op->container) 2965 op->close_container (); /* close open sack first */
2979 esrv_apply_container (op, op->container); /* close open sack first */
2980 2966
2981 for (tmp = op->inv; tmp; tmp = next) 2967 for (tmp = op->inv; tmp; tmp = next)
2982 { 2968 {
2983 next = tmp->below; 2969 next = tmp->below;
2984 2970
2985 if (tmp->invisible) 2971 if (tmp->invisible)
2986 continue; 2972 continue;
2987 2973
2988 tmp->remove (); 2974 tmp->remove ();
2989 tmp->x = op->x, tmp->y = op->y; 2975 tmp->x = op->x, tmp->y = op->y;
2976
2990 if (tmp->type == CONTAINER) 2977 if (tmp->type == CONTAINER)
2991 { /* empty container to ground */ 2978 loot_object (tmp); /* empty container to ground */
2992 loot_object (tmp); 2979
2993 }
2994 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2980 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
2995 { 2981 {
2996 if (tmp->nrof > 1) 2982 if (tmp->nrof > 1)
2997 { 2983 {
2998 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2984 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
2999 tmp2->destroy (); 2985 tmp2->destroy ();
… …
3010/* 2996/*
3011 * fix_weight(): Check recursively the weight of all players, and fix 2997 * fix_weight(): Check recursively the weight of all players, and fix
3012 * what needs to be fixed. Refresh windows and fix speed if anything 2998 * what needs to be fixed. Refresh windows and fix speed if anything
3013 * was changed. 2999 * was changed.
3014 */ 3000 */
3015
3016void 3001void
3017fix_weight (void) 3002fix_weight (void)
3018{ 3003{
3019 for_all_players (pl) 3004 for_all_players (pl)
3020 { 3005 {
… …
3080 if (op->type == PLAYER) 3065 if (op->type == PLAYER)
3081 { 3066 {
3082 op->contr->tmp_invis = 0; 3067 op->contr->tmp_invis = 0;
3083 op->contr->invis_race = 0; 3068 op->contr->invis_race = 0;
3084 } 3069 }
3070
3085 update_object (op, UP_OBJ_FACE); 3071 update_object (op, UP_OBJ_CHANGE);
3086} 3072}
3087 3073
3088int 3074int
3089is_true_undead (object *op) 3075is_true_undead (object *op)
3090{ 3076{
3091 object *tmp = NULL;
3092
3093 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3077 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3094 return 1; 3078 return 1;
3095 3079
3096 return 0; 3080 return 0;
3097} 3081}
… …
3385 char buf[MAX_BUF]; /* tmp. string buffer */ 3369 char buf[MAX_BUF]; /* tmp. string buffer */
3386 int i = 0, j = 0; 3370 int i = 0, j = 0;
3387 3371
3388 /* get the appropriate treasurelist */ 3372 /* get the appropriate treasurelist */
3389 if (atnr == ATNR_FIRE) 3373 if (atnr == ATNR_FIRE)
3390 trlist = find_treasurelist ("dragon_ability_fire"); 3374 trlist = treasurelist::find ("dragon_ability_fire");
3391 else if (atnr == ATNR_COLD) 3375 else if (atnr == ATNR_COLD)
3392 trlist = find_treasurelist ("dragon_ability_cold"); 3376 trlist = treasurelist::find ("dragon_ability_cold");
3393 else if (atnr == ATNR_ELECTRICITY) 3377 else if (atnr == ATNR_ELECTRICITY)
3394 trlist = find_treasurelist ("dragon_ability_elec"); 3378 trlist = treasurelist::find ("dragon_ability_elec");
3395 else if (atnr == ATNR_POISON) 3379 else if (atnr == ATNR_POISON)
3396 trlist = find_treasurelist ("dragon_ability_poison"); 3380 trlist = treasurelist::find ("dragon_ability_poison");
3397 3381
3398 if (trlist == NULL || who->type != PLAYER) 3382 if (trlist == NULL || who->type != PLAYER)
3399 return; 3383 return;
3400 3384
3401 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3385 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3533 * not readied. 3517 * not readied.
3534 */ 3518 */
3535void 3519void
3536player_unready_range_ob (player *pl, object *ob) 3520player_unready_range_ob (player *pl, object *ob)
3537{ 3521{
3538 rangetype i;
3539
3540 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3522 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3541 {
3542 if (pl->ranges[i] == ob) 3523 if (pl->ranges[i] == ob)
3543 { 3524 {
3544 pl->ranges[i] = NULL; 3525 pl->ranges[i] = 0;
3545 if (pl->shoottype == i) 3526 if (pl->shoottype == i)
3546 {
3547 pl->shoottype = range_none; 3527 pl->shoottype = range_none;
3548 }
3549 } 3528 }
3550 }
3551} 3529}
3530
3531sint8
3532player::visibility_at (maptile *map, int x, int y) const
3533{
3534 if (!ns)
3535 return 0;
3536
3537 int dx, dy;
3538 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3539 return 0;
3540
3541 x += dx - ns->current_x + ns->mapx / 2;
3542 y += dy - ns->current_y + ns->mapy / 2;
3543
3544 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3545 return 0;
3546
3547 return 100 - blocked_los [x][y];
3548}

Diff Legend

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