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.376 by root, Sun Apr 18 07:08:08 2010 UTC vs.
Revision 1.384 by root, Fri Apr 30 21:00:40 2010 UTC

… …
352#endif 352#endif
353 353
354////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 354//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
355 355
356static SV * 356static SV *
357newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 357newSVptr (void *ptr, HV *stash, HV *hv)
358{ 358{
359 SV *sv; 359 SV *sv;
360 360
361 if (!ptr) 361 if (!ptr)
362 return newSV (0); 362 return newSV (0);
363 363
364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
365 return sv_bless (newRV_noinc ((SV *)hv), stash); 365 return sv_bless (newRV_noinc ((SV *)hv), stash);
366}
367
368static SV *
369newSVptr (void *ptr, HV *stash)
370{
371 return newSVptr (ptr, stash, newHV ());
366} 372}
367 373
368static int 374static int
369attachable_free (pTHX_ SV *sv, MAGIC *mg) 375attachable_free (pTHX_ SV *sv, MAGIC *mg)
370{ 376{
… …
764 exit (EXIT_FAILURE); 770 exit (EXIT_FAILURE);
765 } 771 }
766 772
767 eval_pv ( 773 eval_pv (
768 "#line 1 'cfperl init'\n" 774 "#line 1 'cfperl init'\n"
769 "use EV ();\n" 775 "use EV ();\n" // required by bootstrap
770 "use Coro ();\n" 776 "use Coro ();\n" // required by bootstrap
771 "cf->bootstrap;\n" 777 "cf->bootstrap;\n" // required for cf::datadir
772 "unshift @INC, cf::datadir ();\n" 778 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
773 "require cf;\n", 779 "require cf;\n",
774 0 780 0
775 ); 781 );
776 782
777 if (SvTRUE (ERRSV)) 783 if (SvTRUE (ERRSV))
… …
1450# undef def 1456# undef def
1451# define def(uc, flags) const_iv (SK_ ## uc) 1457# define def(uc, flags) const_iv (SK_ ## uc)
1452# include "skillinc.h" 1458# include "skillinc.h"
1453# undef def 1459# undef def
1454 1460
1455 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1456 const_iv (logBacktrace)
1457
1458 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1461 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1459 1462
1460 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1463 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1461 1464
1462 const_iv (MAX_TIME) 1465 const_iv (MAX_TIME)
… …
1488 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1491 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1489 1492
1490 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1493 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1491 }; 1494 };
1492 1495
1493 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1496 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1494 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1497 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1495 1498
1496 static const struct { 1499 static const struct {
1497 const char *name; 1500 const char *name;
1498 int skip; 1501 int skip;
… …
1504# undef def 1507# undef def
1505 }; 1508 };
1506 1509
1507 AV *av = get_av ("cf::EVENT", 1); 1510 AV *av = get_av ("cf::EVENT", 1);
1508 1511
1509 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1512 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1510 { 1513 {
1511 AV *event = newAV (); 1514 AV *event = newAV ();
1512 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1515 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1513 av_push (event, newSViv (eiv->klass)); 1516 av_push (event, newSViv (eiv->klass));
1514 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1517 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1883 CODE: 1886 CODE:
1884 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1887 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1885 OUTPUT: 1888 OUTPUT:
1886 RETVAL 1889 RETVAL
1887 1890
1891bool should_invoke (attachable *obj, int event)
1892 CODE:
1893 RETVAL = obj->should_invoke ((event_type)event);
1894 OUTPUT: RETVAL
1895
1888void 1896void
1889debug_trace (attachable *obj, bool on = true) 1897debug_trace (attachable *obj, bool on = true)
1890 CODE: 1898 CODE:
1891 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE; 1899 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1892 if (on) 1900 if (on)
… …
2078 2086
2079void pick_up (object *who, object *op) 2087void pick_up (object *who, object *op)
2080 2088
2081void update_object (object *op, int action) 2089void update_object (object *op, int action)
2082 2090
2083void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2091void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2084 2092
2085void player_lvl_adj (object *who, object *skill = 0) 2093void player_lvl_adj (object *who, object *skill = 0)
2086 2094
2087int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2088 2096
… …
2453 if (oblinkpt *obp = map->find_link (connection)) 2461 if (oblinkpt *obp = map->find_link (connection))
2454 for (objectlink *ol = obp->link; ol; ol = ol->next) 2462 for (objectlink *ol = obp->link; ol; ol = ol->next)
2455 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2463 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2456 2464
2457void 2465void
2458get_map_flags (maptile *map, int x, int y) 2466xy_normalise (maptile *map, int x, int y, int dir = 0)
2459 PPCODE: 2467 PPCODE:
2460{ 2468{
2461 maptile *nmap = 0; 2469 mapxy pos (map, x, y);
2462 I16 nx = 0, ny = 0; 2470 if (!pos.move (dir).normalise ())
2471 XSRETURN_EMPTY;
2463 2472
2464 PUTBACK;
2465 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2466 SPAGAIN;
2467
2468 EXTEND (SP, 4); 2473 EXTEND (SP, 3);
2469 PUSHs (sv_2mortal (newSViv (flags)));
2470
2471 if (GIMME_V == G_ARRAY)
2472 {
2473 PUSHs (sv_2mortal (to_sv (nmap))); 2474 PUSHs (sv_2mortal (to_sv (pos.m)));
2474 PUSHs (sv_2mortal (newSViv (nx))); 2475 PUSHs (sv_2mortal (to_sv (pos.x)));
2475 PUSHs (sv_2mortal (newSViv (ny))); 2476 PUSHs (sv_2mortal (to_sv (pos.y)));
2476 }
2477} 2477}
2478 2478
2479mapspace * 2479mapspace *
2480ms (maptile *map, unsigned int x, unsigned int y) 2480ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2481 PROTOTYPE: $$$ 2481 PROTOTYPE: $$$;$
2482 CODE: 2482 CODE:
2483{ 2483{
2484 maptile *nmap = 0; 2484 mapxy pos (map, x, y);
2485 I16 nx, ny; 2485 if (!pos.move (dir).normalise ())
2486
2487 PUTBACK;
2488 get_map_flags (map, &nmap, x, y, &nx, &ny);
2489 SPAGAIN;
2490
2491 if (!nmap)
2492 XSRETURN_UNDEF; 2486 XSRETURN_UNDEF;
2493 2487
2494 RETVAL = &nmap->at (nx, ny); 2488 RETVAL = &*pos;
2495} 2489}
2496 OUTPUT: 2490 OUTPUT:
2497 RETVAL 2491 RETVAL
2498 2492
2499void 2493void
2500at (maptile *map, unsigned int x, unsigned int y) 2494at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2501 PROTOTYPE: $$$ 2495 PROTOTYPE: $$$;$
2502 PPCODE: 2496 PPCODE:
2503{ 2497 mapxy pos (map, x, y);
2504 maptile *nmap = 0; 2498 if (pos.move (dir).normalise ())
2505 I16 nx, ny;
2506
2507 PUTBACK;
2508 get_map_flags (map, &nmap, x, y, &nx, &ny);
2509 SPAGAIN;
2510
2511 if (nmap)
2512 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2499 for (object *o = pos->bot; o; o = o->above)
2513 XPUSHs (sv_2mortal (to_sv (o))); 2500 XPUSHs (sv_2mortal (to_sv (o)));
2514}
2515 2501
2516SV * 2502SV *
2517bot_at (maptile *map, unsigned int x, unsigned int y) 2503bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2518 PROTOTYPE: $$$ 2504 PROTOTYPE: $$$;$
2519 ALIAS: 2505 ALIAS:
2520 top_at = 1 2506 top_at = 1
2521 flags_at = 2 2507 flags_at = 2
2522 light_at = 3 2508 light_at = 3
2523 move_block_at = 4 2509 move_block_at = 4
2524 move_slow_at = 5 2510 move_slow_at = 5
2525 move_on_at = 6 2511 move_on_at = 6
2526 move_off_at = 7 2512 move_off_at = 7
2527 CODE: 2513 CODE:
2528{ 2514{
2529 sint16 nx = x; 2515 mapxy pos (map, x, y);
2530 sint16 ny = y; 2516 if (!pos.move (dir).normalise ())
2531
2532 if (!xy_normalise (map, nx, ny))
2533 XSRETURN_UNDEF; 2517 XSRETURN_UNDEF;
2534 2518
2535 mapspace &ms = map->at (nx, ny); 2519 mapspace &ms = *pos;
2536 2520
2537 ms.update (); 2521 ms.update ();
2538 2522
2539 switch (ix) 2523 switch (ix)
2540 { 2524 {
… …
2674list () 2658list ()
2675 PPCODE: 2659 PPCODE:
2676 for_all_regions (rgn) 2660 for_all_regions (rgn)
2677 XPUSHs (sv_2mortal (to_sv (rgn))); 2661 XPUSHs (sv_2mortal (to_sv (rgn)));
2678 2662
2679region *find (utf8_string name)
2680 PROTOTYPE: $
2681 CODE:
2682 RETVAL = region::find (name);
2683 OUTPUT: RETVAL
2684
2685int specificity (region *rgn) 2663int specificity (region *rgn)
2686 CODE: 2664 CODE:
2687 RETVAL = 0; 2665 RETVAL = 0;
2688 while (rgn = rgn->parent) 2666 while (rgn = rgn->parent)
2689 RETVAL++; 2667 RETVAL++;

Diff Legend

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