ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/cfperl.xs
(Generate patch)

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.305 by root, Fri Oct 31 14:13:46 2008 UTC vs.
Revision 1.312 by root, Tue Dec 23 06:58:24 2008 UTC

… …
1074maptile::do_load_sync () 1074maptile::do_load_sync ()
1075{ 1075{
1076 CALL_BEGIN (1); 1076 CALL_BEGIN (1);
1077 CALL_ARG (this); 1077 CALL_ARG (this);
1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1079 CALL_END;
1080}
1081
1082void
1083maptile::change_all_map_light (int change)
1084{
1085 CALL_BEGIN (1);
1086 CALL_ARG (change);
1087 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1088 CALL_END; 1079 CALL_END;
1089} 1080}
1090 1081
1091void 1082void
1092object::enter_exit (object *exit) 1083object::enter_exit (object *exit)
… …
1339 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1330 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1340 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1331 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1341 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1332 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1342 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1333 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1343 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1334 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1344 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1335 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1345 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1336 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1346 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1337 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1347 1338
1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1339 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1349 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1340 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
… …
1600 1591
1601void init_attackmess () 1592void init_attackmess ()
1602 1593
1603void init_dynamic () 1594void init_dynamic ()
1604 1595
1605void init_block ()
1606
1607void load_settings () 1596void load_settings ()
1608 1597
1609void load_materials () 1598void load_materials ()
1610 1599
1611void init_uuid () 1600void init_uuid ()
… …
1795 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1784 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1796 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1785 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1797 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1786 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1798 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1787 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1799#endif 1788#endif
1800 EXTEND (SP, 2*2); 1789 EXTEND (SP, 5*2);
1801 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1790 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1802 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1791 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1803 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1792 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1793 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1794 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1804} 1795}
1805 1796
1806int find_animation (utf8_string text) 1797int find_animation (utf8_string text)
1807 PROTOTYPE: $ 1798 PROTOTYPE: $
1808 1799
… …
2248 pl->ob->stats.hp = pl->ob->stats.maxhp; 2239 pl->ob->stats.hp = pl->ob->stats.maxhp;
2249 pl->ob->stats.sp = pl->ob->stats.maxsp; 2240 pl->ob->stats.sp = pl->ob->stats.maxsp;
2250 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2241 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2251 pl->orig_stats = pl->ob->stats; 2242 pl->orig_stats = pl->ob->stats;
2252 2243
2253void clear_los (player *pl) 2244# should only be temporary
2245void esrv_new_player (player *pl)
2254 2246
2247#d# TODO: replace by blocked_los accessor, fix code using this
2255bool 2248bool
2256cell_visible (player *pl, int dx, int dy) 2249cell_visible (player *pl, int dx, int dy)
2257 CODE: 2250 CODE:
2258 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2251 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2259 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2260 OUTPUT: 2252 OUTPUT:
2261 RETVAL 2253 RETVAL
2262 2254
2263void 2255void
2264send (player *pl, SV *packet) 2256send (player *pl, SV *packet)
… …
2332} 2324}
2333 2325
2334INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2326INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2335 2327
2336void 2328void
2329adjust_daylight ()
2330 CODE:
2331 maptile::adjust_daylight ();
2332
2333void
2337maptile::instantiate () 2334maptile::instantiate ()
2338 2335
2339maptile *new () 2336maptile *new ()
2340 PROTOTYPE: 2337 PROTOTYPE:
2341 CODE: 2338 CODE:
… …
2520 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2517 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2521 XPUSHs (sv_2mortal (to_sv (o))); 2518 XPUSHs (sv_2mortal (to_sv (o)));
2522} 2519}
2523 2520
2524SV * 2521SV *
2525bot_at (maptile *obj, unsigned int x, unsigned int y) 2522bot_at (maptile *map, unsigned int x, unsigned int y)
2526 PROTOTYPE: $$$ 2523 PROTOTYPE: $$$
2527 ALIAS: 2524 ALIAS:
2528 top_at = 1 2525 top_at = 1
2529 flags_at = 2 2526 flags_at = 2
2530 light_at = 3 2527 light_at = 3
2531 move_block_at = 4 2528 move_block_at = 4
2532 move_slow_at = 5 2529 move_slow_at = 5
2533 move_on_at = 6 2530 move_on_at = 6
2534 move_off_at = 7 2531 move_off_at = 7
2535 INIT:
2536 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2537 CODE: 2532 CODE:
2533{
2534 sint16 nx = x;
2535 sint16 ny = y;
2536
2537 if (!xy_normalise (map, nx, ny))
2538 XSRETURN_UNDEF;
2539
2540 mapspace &ms = map->at (nx, ny);
2541
2542 ms.update ();
2543
2538 switch (ix) 2544 switch (ix)
2539 { 2545 {
2540 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2546 case 0: RETVAL = to_sv (ms.bot ); break;
2541 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2547 case 1: RETVAL = to_sv (ms.top ); break;
2542 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2548 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2543 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2549 case 3: RETVAL = newSViv (ms.light ); break;
2544 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2550 case 4: RETVAL = newSVuv (ms.move_block); break;
2545 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2551 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2546 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2552 case 6: RETVAL = newSVuv (ms.move_on ); break;
2547 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2553 case 7: RETVAL = newSVuv (ms.move_off ); break;
2548 } 2554 }
2555}
2549 OUTPUT: RETVAL 2556 OUTPUT: RETVAL
2550 2557
2551void fix_walls (maptile *map, int x, int y) 2558void fix_walls (maptile *map, int x, int y)
2552 2559
2553void fix_walls_around (maptile *map, int x, int y) 2560void fix_walls_around (maptile *map, int x, int y)

Diff Legend

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