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.44 by root, Sat Dec 16 03:21:08 2006 UTC vs.
Revision 1.51 by root, Thu Dec 21 06:12:37 2006 UTC

… …
263 p->usekeys = containers; 263 p->usekeys = containers;
264 p->last_weapon_sp = -1; 264 p->last_weapon_sp = -1;
265 p->peaceful = 1; /* default peaceful */ 265 p->peaceful = 1; /* default peaceful */
266 p->do_los = 1; 266 p->do_los = 1;
267 p->explore = 0; 267 p->explore = 0;
268 p->no_shout = 0; /* default can shout */
269 268
270 assign (p->title, op->arch->clone.name); 269 assign (p->title, op->arch->clone.name);
271 op->race = op->arch->clone.race; 270 op->race = op->arch->clone.race;
272 271
273 CLEAR_FLAG (op, FLAG_READY_SKILL); 272 CLEAR_FLAG (op, FLAG_READY_SKILL);
… …
300set_first_map (object *op) 299set_first_map (object *op)
301{ 300{
302 strcpy (op->contr->maplevel, first_map_path); 301 strcpy (op->contr->maplevel, first_map_path);
303 op->x = -1; 302 op->x = -1;
304 op->y = -1; 303 op->y = -1;
305 enter_exit (op, NULL); 304 enter_exit (op, 0);
306} 305}
307 306
308/* Tries to add player on the connection passwd in ns. 307/* Tries to add player on the connection passwd in ns.
309 * 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
310 * mode. 309 * mode.
… …
328 CLEAR_FLAG (p->ob, FLAG_FRIENDLY); 327 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
329 add_friendly_object (p->ob); 328 add_friendly_object (p->ob);
330 send_rules (p->ob); 329 send_rules (p->ob);
331 send_news (p->ob); 330 send_news (p->ob);
332 display_motd (p->ob); 331 display_motd (p->ob);
332
333 get_name (p->ob); 333 get_name (p->ob);
334 334
335 return 0; 335 return 0;
336} 336}
337 337
… …
349 { 349 {
350 if (at == NULL || at->next == NULL) 350 if (at == NULL || at->next == NULL)
351 at = first_archetype; 351 at = first_archetype;
352 else 352 else
353 at = at->next; 353 at = at->next;
354
354 if (at->clone.type == PLAYER) 355 if (at->clone.type == PLAYER)
355 return at; 356 return at;
357
356 if (at == start) 358 if (at == start)
357 { 359 {
358 LOG (llevError, "No Player archetypes\n"); 360 LOG (llevError, "No Player archetypes\n");
359 exit (-1); 361 exit (-1);
360 } 362 }
361 } 363 }
362} 364}
363
364 365
365object * 366object *
366get_nearest_player (object *mon) 367get_nearest_player (object *mon)
367{ 368{
368 object *op = NULL; 369 object *op = NULL;
… …
725 * 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
726 * cases. 727 * cases.
727 */ 728 */
728 if (!QUERY_FLAG (op, FLAG_REMOVED)) 729 if (!QUERY_FLAG (op, FLAG_REMOVED))
729 op->remove (); 730 op->remove ();
731
730 /* 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,
731 * 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
732 * the map is null or not swapped out. 734 * the map is null or not swapped out.
733 */ 735 */
734 op->map = NULL; 736 op->map = NULL;
… …
1092 * if the map isn't there, then stay on the 1094 * if the map isn't there, then stay on the
1093 * default initial map */ 1095 * default initial map */
1094 tmp->destroy (); 1096 tmp->destroy ();
1095 } 1097 }
1096 else 1098 else
1097 {
1098 LOG (llevDebug, "first_map_ext_path not set\n"); 1099 LOG (llevDebug, "first_map_ext_path not set\n");
1099 } 1100
1100 return 0; 1101 return 0;
1101 } 1102 }
1102 1103
1103 /* Following actually changes the race - this is the default command 1104 /* Following actually changes the race - this is the default command
1104 * if we don't match with one of the options above. 1105 * if we don't match with one of the options above.
… …
1224 { 1225 {
1225 op->enemy = NULL; 1226 op->enemy = NULL;
1226 CLEAR_FLAG (op, FLAG_SCARED); 1227 CLEAR_FLAG (op, FLAG_SCARED);
1227 return; 1228 return;
1228 } 1229 }
1230
1229 get_rangevector (op, op->enemy, &rv, 0); 1231 get_rangevector (op, op->enemy, &rv, 0);
1230 1232
1231 dir = absdir (4 + rv.direction); 1233 dir = absdir (4 + rv.direction);
1232 for (diff = 0; diff < 3; diff++) 1234 for (diff = 0; diff < 3; diff++)
1233 { 1235 {
1234 int m = 1 - (RANDOM () & 2); 1236 int m = 1 - (RANDOM () & 2);
1235 1237
1236 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)))
1237 {
1238 return; 1239 return;
1239 }
1240 } 1240 }
1241
1241 /* Cornered, get rid of scared */ 1242 /* Cornered, get rid of scared */
1242 CLEAR_FLAG (op, FLAG_SCARED); 1243 CLEAR_FLAG (op, FLAG_SCARED);
1243 op->enemy = NULL; 1244 op->enemy = NULL;
1244} 1245}
1245 1246
… …
1801 if (!dir) 1802 if (!dir)
1802 { 1803 {
1803 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!");
1804 return 0; 1805 return 0;
1805 } 1806 }
1807
1806 if (op->type == PLAYER) 1808 if (op->type == PLAYER)
1807 bow = op->contr->ranges[range_bow]; 1809 bow = op->contr->ranges[range_bow];
1808 else 1810 else
1809 { 1811 {
1810 for (bow = op->inv; bow; bow = bow->below) 1812 for (bow = op->inv; bow; bow = bow->below)
… …
1818 { 1820 {
1819 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1821 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1820 return 0; 1822 return 0;
1821 } 1823 }
1822 } 1824 }
1825
1823 if (!bow->race || !bow->skill) 1826 if (!bow->race || !bow->skill)
1824 { 1827 {
1825 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);
1826 return 0; 1829 return 0;
1827 } 1830 }
… …
1829 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1832 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1830 1833
1831 /* penalize ROF for bestarrow */ 1834 /* penalize ROF for bestarrow */
1832 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1835 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1833 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1836 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1837
1834 if (bowspeed < 1) 1838 if (bowspeed < 1)
1835 bowspeed = 1; 1839 bowspeed = 1;
1836 1840
1837 if (arrow == NULL) 1841 if (arrow == NULL)
1838 { 1842 {
… …
1844 else 1848 else
1845 CLEAR_FLAG (op, FLAG_READY_BOW); 1849 CLEAR_FLAG (op, FLAG_READY_BOW);
1846 return 0; 1850 return 0;
1847 } 1851 }
1848 } 1852 }
1853
1849 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1854 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1850 if (mflags & P_OUT_OF_MAP) 1855 if (mflags & P_OUT_OF_MAP)
1851 {
1852 return 0; 1856 return 0;
1853 } 1857
1854 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1858 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1855 { 1859 {
1856 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.");
1857 return 0; 1861 return 0;
1858 } 1862 }
… …
1864 return 0; 1868 return 0;
1865 } 1869 }
1866 1870
1867 left = arrow; /* these are arrows left to the player */ 1871 left = arrow; /* these are arrows left to the player */
1868 arrow = get_split_ob (arrow, 1); 1872 arrow = get_split_ob (arrow, 1);
1869 if (arrow == NULL) 1873 if (!arrow)
1870 { 1874 {
1871 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);
1872 return 0; 1876 return 0;
1873 } 1877 }
1878
1874 arrow->set_owner (op); 1879 arrow->set_owner (op);
1875 arrow->skill = bow->skill; 1880 arrow->skill = bow->skill;
1876 1881
1877 arrow->direction = dir; 1882 arrow->direction = dir;
1878 arrow->x = sx; 1883 arrow->x = sx;
… …
1921 } 1926 }
1922 1927
1923 if (arrow->attacktype == AT_PHYSICAL) 1928 if (arrow->attacktype == AT_PHYSICAL)
1924 arrow->attacktype |= bow->attacktype; 1929 arrow->attacktype |= bow->attacktype;
1925 1930
1926 if (bow->slaying != NULL) 1931 if (bow->slaying)
1927 arrow->slaying = bow->slaying; 1932 arrow->slaying = bow->slaying;
1928 1933
1929 arrow->map = m; 1934 arrow->map = m;
1930 arrow->move_type = MOVE_FLY_LOW; 1935 arrow->move_type = MOVE_FLY_LOW;
1931 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1936 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
2047 CLEAR_FLAG (item, FLAG_ANIMATE); 2052 CLEAR_FLAG (item, FLAG_ANIMATE);
2048 item->face = item->arch->clone.face; 2053 item->face = item->arch->clone.face;
2049 item->speed = 0; 2054 item->speed = 0;
2050 update_ob_speed (item); 2055 update_ob_speed (item);
2051 } 2056 }
2052 if ((tmp = is_player_inv (item))) 2057 if ((tmp = item->in_player ()))
2053 esrv_update_item (UPD_ANIM, tmp, item); 2058 esrv_update_item (UPD_ANIM, tmp, item);
2054 } 2059 }
2055 } 2060 }
2056 else if (item->type == ROD || item->type == HORN) 2061 else if (item->type == ROD || item->type == HORN)
2057 { 2062 {
… …
2207 * 0 otherwise 2212 * 0 otherwise
2208 */ 2213 */
2209static int 2214static int
2210player_attack_door (object *op, object *door) 2215player_attack_door (object *op, object *door)
2211{ 2216{
2212
2213 /* 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,
2214 * 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 -
2215 * otherwise, we fall through to the rest of the code. 2219 * otherwise, we fall through to the rest of the code.
2216 */ 2220 */
2217 object *key = find_key (op, op, door); 2221 object *key = find_key (op, op, door);
… …
2255 * It should keep the code cleaner. 2259 * It should keep the code cleaner.
2256 * When this is called, the players direction has been updated 2260 * When this is called, the players direction has been updated
2257 * (taking into account confusion.) The player is also actually 2261 * (taking into account confusion.) The player is also actually
2258 * going to try and move (not fire weapons). 2262 * going to try and move (not fire weapons).
2259 */ 2263 */
2260
2261void 2264void
2262move_player_attack (object *op, int dir) 2265move_player_attack (object *op, int dir)
2263{ 2266{
2264 object *tmp, *mon; 2267 object *tmp, *mon;
2265 sint16 nx, ny; 2268 sint16 nx, ny;
… …
2267 maptile *m; 2270 maptile *m;
2268 2271
2269 nx = freearr_x[dir] + op->x; 2272 nx = freearr_x[dir] + op->x;
2270 ny = freearr_y[dir] + op->y; 2273 ny = freearr_y[dir] + op->y;
2271 2274
2272 on_battleground = op_on_battleground (op, NULL, NULL); 2275 on_battleground = op_on_battleground (op, 0, 0);
2273 2276
2274 /* 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
2275 * 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
2276 * 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
2277 * player. This is a pretty nasty hack, because if we could 2280 * player. This is a pretty nasty hack, because if we could
… …
2289 return; /* Don't think this should happen */ 2292 return; /* Don't think this should happen */
2290 } 2293 }
2291 else 2294 else
2292 m = op->map; 2295 m = op->map;
2293 2296
2294 if ((tmp = get_map_ob (m, nx, ny)) == NULL) 2297 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2295 { 2298 {
2296 /* 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"); */
2297 return; 2300 return;
2298 } 2301 }
2299 2302
2300 mon = NULL; 2303 mon = 0;
2301 /* 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
2302 * 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.
2303 * 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
2304 * on the space 2307 * on the space
2305 */ 2308 */
2306 while (tmp != NULL) 2309 while (tmp)
2307 { 2310 {
2308 if (tmp == op) 2311 if (tmp == op)
2309 { 2312 {
2310 tmp = tmp->above; 2313 tmp = tmp->above;
2311 continue; 2314 continue;
… …
2321 mon = tmp; 2324 mon = tmp;
2322 2325
2323 tmp = tmp->above; 2326 tmp = tmp->above;
2324 } 2327 }
2325 2328
2326 if (mon == NULL) /* This happens anytime the player tries to move */ 2329 if (!mon) /* This happens anytime the player tries to move */
2327 return; /* into a wall */ 2330 return; /* into a wall */
2328 2331
2329 if (mon->head != NULL) 2332 if (mon->head)
2330 mon = mon->head; 2333 mon = mon->head;
2331 2334
2332 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))
2333 if (player_attack_door (op, mon)) 2336 if (player_attack_door (op, mon))
2334 return; 2337 return;
… …
2371 * attack them either. 2374 * attack them either.
2372 */ 2375 */
2373 if ((mon->type == PLAYER || mon->enemy != op) && 2376 if ((mon->type == PLAYER || mon->enemy != op) &&
2374 (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)) && (
2375#ifdef PROHIBIT_PLAYERKILL 2378#ifdef PROHIBIT_PLAYERKILL
2376 (op->contr->peaceful 2379 (op->contr->peaceful
2377 || (mon->type == PLAYER 2380 || (mon->type == PLAYER
2378 && mon->contr-> 2381 && mon->contr->
2379 peaceful)) && 2382 peaceful)) &&
2380#else 2383#else
2381 op->contr->peaceful && 2384 op->contr->peaceful &&
2382#endif 2385#endif
2383 !on_battleground)) 2386 !on_battleground))
2384 { 2387 {
2385 if (!op->contr->braced) 2388 if (!op->contr->braced)
2386 { 2389 {
2387 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);
2388 (void) push_ob (mon, dir, op); 2391 (void) push_ob (mon, dir, op);
2389 } 2392 }
2390 else 2393 else
2391 {
2392 new_draw_info (0, 0, op, "You withhold your attack"); 2394 new_draw_info (0, 0, op, "You withhold your attack");
2393 } 2395
2394 if (op->contr->tmp_invis || op->hide) 2396 if (op->contr->tmp_invis || op->hide)
2395 make_visible (op); 2397 make_visible (op);
2396 } 2398 }
2397 2399
2398 /* If the object is a boulder or other rollable object, then 2400 /* If the object is a boulder or other rollable object, then
… …
2426 op->speed_left += op->speed / op->contr->weapon_sp; 2428 op->speed_left += op->speed / op->contr->weapon_sp;
2427 2429
2428 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 */
2429 } 2431 }
2430 2432
2431 skill_attack (mon, op, 0, NULL, NULL); 2433 skill_attack (mon, op, 0, 0, 0);
2432 2434
2433 /* If attacking another player, that player gets automatic 2435 /* If attacking another player, that player gets automatic
2434 * hitback, and doesn't loose luck either. 2436 * hitback, and doesn't loose luck either.
2435 * Disable hitback on the battleground or if the target is 2437 * Disable hitback on the battleground or if the target is
2436 * the wiz. 2438 * the wiz.
… …
2438 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))
2439 { 2441 {
2440 short luck = mon->stats.luck; 2442 short luck = mon->stats.luck;
2441 2443
2442 mon->contr->has_hit = 1; 2444 mon->contr->has_hit = 1;
2443 skill_attack (op, mon, 0, NULL, NULL); 2445 skill_attack (op, mon, 0, 0, 0);
2444 mon->stats.luck = luck; 2446 mon->stats.luck = luck;
2445 } 2447 }
2448
2446 if (action_makes_visible (op)) 2449 if (action_makes_visible (op))
2447 make_visible (op); 2450 make_visible (op);
2448 } 2451 }
2449 } /* if player should attack something */ 2452 } /* if player should attack something */
2450} 2453}
… …
2485 2488
2486 /* 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
2487 * server can handle repeat firing. 2490 * server can handle repeat firing.
2488 */ 2491 */
2489 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2492 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2490 {
2491 op->direction = dir; 2493 op->direction = dir;
2492 }
2493 else 2494 else
2494 {
2495 op->direction = 0; 2495 op->direction = 0;
2496 } 2496
2497 /* Update how the player looks. Use the facing, so direction may 2497 /* Update how the player looks. Use the facing, so direction may
2498 * get reset to zero. This allows for full animation capabilities 2498 * get reset to zero. This allows for full animation capabilities
2499 * for players. 2499 * for players.
2500 */ 2500 */
2501 animate_object (op, op->facing); 2501 animate_object (op, op->facing);
… …
2553 2553
2554 /* 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
2555 * the players time has been increased when doericserver has been 2555 * the players time has been increased when doericserver has been
2556 * called, so we recheck it here. 2556 * called, so we recheck it here.
2557 */ 2557 */
2558 op->contr->socket->handle_command (); 2558 //TODO: better than handling 8 commands, use some more intelligent rate-limiting
2559 for (int rep = 8; --rep && op->contr->socket->handle_command (); )
2560 ;
2561
2559 if (op->speed_left < 0) 2562 if (op->speed_left < 0)
2560 return 0; 2563 return 0;
2561 2564
2562 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2565 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2563 { 2566 {
… …
3222 * at his savebed location, and that can have long lasting 3225 * at his savebed location, and that can have long lasting
3223 * spell effects. So first see if there is a spell effect 3226 * spell effects. So first see if there is a spell effect
3224 * on the space that might harm the player. 3227 * on the space that might harm the player.
3225 */ 3228 */
3226 will_kill_again = 0; 3229 will_kill_again = 0;
3227 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)
3228 if (tmp->type == SPELL_EFFECT) 3231 if (tmp->type == SPELL_EFFECT)
3229 will_kill_again |= tmp->attacktype; 3232 will_kill_again |= tmp->attacktype;
3230 3233
3231 if (will_kill_again) 3234 if (will_kill_again)
3232 { 3235 {
… …
3329 } 3332 }
3330 3333
3331 for (tmp = op->inv; tmp != NULL; tmp = next) 3334 for (tmp = op->inv; tmp != NULL; tmp = next)
3332 { 3335 {
3333 next = tmp->below; 3336 next = tmp->below;
3334 if (tmp->type == EXPERIENCE || tmp->invisible) 3337 if (tmp->invisible)
3335 continue; 3338 continue;
3336 tmp->remove (); 3339 tmp->remove ();
3337 tmp->x = op->x, tmp->y = op->y; 3340 tmp->x = op->x, tmp->y = op->y;
3338 if (tmp->type == CONTAINER) 3341 if (tmp->type == CONTAINER)
3339 { /* empty container to ground */ 3342 { /* empty container to ground */
… …
3445 object *tmp = NULL; 3448 object *tmp = NULL;
3446 3449
3447 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3450 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3448 return 1; 3451 return 1;
3449 3452
3450 if (op->type == PLAYER)
3451 for (tmp = op->inv; tmp; tmp = tmp->below)
3452 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3453 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3454 return 1;
3455 return 0; 3453 return 0;
3456} 3454}
3457 3455
3458/* look at the surrounding terrain to determine 3456/* look at the surrounding terrain to determine
3459 * the hideability of this object. Positive levels 3457 * the hideability of this object. Positive levels
… …
3574 if (mflags & P_OUT_OF_MAP) 3572 if (mflags & P_OUT_OF_MAP)
3575 continue; 3573 continue;
3576 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)))
3577 continue; 3575 continue;
3578 3576
3579 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)
3580 { 3578 {
3581 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))
3582 return 1; 3580 return 1;
3583 else if (tmp->type == PLAYER) 3581 else if (tmp->type == PLAYER)
3584 { 3582 {

Diff Legend

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