[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.312 by root, Tue Dec 23 06:58:24 2008 UTC

…		…
88	*stash_cf_arch_wrap,	88	*stash_cf_arch_wrap,
89	*stash_cf_party_wrap,	89	*stash_cf_party_wrap,
90	*stash_cf_region_wrap,	90	*stash_cf_region_wrap,
91	*stash_cf_living_wrap;	91	*stash_cf_living_wrap;
92		92
		93	#ifndef newSVpv_utf8
93	static inline SV *	94	static inline SV *
94	newSVpv_utf8 (const char *s)	95	newSVpv_utf8 (const char *s)
95	{	96	{
96	if (!s)	97	if (!s)
97	return newSV (0);	98	return newSV (0);
98		99
99	SV *sv = newSVpv (s, 0);	100	SV *sv = newSVpv (s, 0);
100	SvUTF8_on (sv);	101	SvUTF8_on (sv);
101	return sv;	102	return sv;
102	}	103	}
		104	#endif
103		105
		106	#ifndef newSVpvn_utf8
104	static inline SV *	107	static inline SV *
105	newSVpvn_utf8 (const char *s, STRLEN l)	108	newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106	{	109	{
107	if (!s)	110	if (!s)
108	return newSV (0);	111	return newSV (0);
109		112
110	SV *sv = newSVpvn (s, l);	113	SV *sv = newSVpvn (s, l);
		114
		115	if (utf8)
111	SvUTF8_on (sv);	116	SvUTF8_on (sv);
		117
112	return sv;	118	return sv;
113	}	119	}
		120	#endif
114		121
115	// helper cast function, returns super class * or 0	122	// helper cast function, returns super class * or 0
116	template<class super>	123	template<class super>
117	static super *	124	static super *
118	is_a (attachable *at)	125	is_a (attachable *at)
…		…
407	return SvPTR (sv, klass);	414	return SvPTR (sv, klass);
408	else	415	else
409	return 0;	416	return 0;
410	}	417	}
411		418
412	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length ()); }	419	inline SV to_sv (const shstr & v) { return newSVpvn_utf8 ((const char )v, v.length (), 1); }
413	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }	420	inline SV to_sv (const char v) { return v ? newSVpv (v, 0) : newSV (0); }
414	inline SV *to_sv (bool v) { return newSViv (v); }	421	inline SV *to_sv (bool v) { return newSViv (v); }
415	inline SV *to_sv ( signed char v) { return newSViv (v); }	422	inline SV *to_sv ( signed char v) { return newSViv (v); }
416	inline SV *to_sv (unsigned char v) { return newSViv (v); }	423	inline SV *to_sv (unsigned char v) { return newSViv (v); }
417	inline SV *to_sv ( signed short v) { return newSViv (v); }	424	inline SV *to_sv ( signed short v) { return newSViv (v); }
…		…
626		633
627	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;	634	PL_exit_flags \|= PERL_EXIT_DESTRUCT_END;
628		635
629	const char *argv[] = {	636	const char *argv[] = {
630	settings.argv [0],	637	settings.argv [0],
631	"-e"	638	"-e0"
632	"use EV; use Coro;" // required for bootstrap
633	"cf->bootstrap;" // required for datadir :*>
634	"unshift @INC, cf::datadir ();"
635	"require cf;"
636	};	639	};
637		640
638	if (perl_parse (perl, xs_init, 2, (char **)argv, environ)	641	if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639	\|\| perl_run (perl))	642	\|\| perl_run (perl))
640	{	643	{
641	printf ("unable to initialize perl-interpreter, aborting.\n");	644	printf ("unable to initialize perl-interpreter, aborting.\n");
642	exit (EXIT_FAILURE);	645	exit (EXIT_FAILURE);
643	}	646	}
644		647
		648	eval_pv (
		649	"#line 1 'cfperl init'\n"
		650	"use EV ();\n"
		651	"use Coro ();\n"
		652	"cf->bootstrap;\n"
		653	"unshift @INC, cf::datadir ();\n"
		654	"require cf;\n",
		655	0
		656	);
		657
		658	if (SvTRUE (ERRSV))
645	{	659	{
646	dSP;	660	printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647		661	exit (EXIT_FAILURE);
648	PUSHMARK (SP);
649	PUTBACK;
650	call_pv ("cf::init", G_DISCARD \| G_VOID);
651	}	662	}
652	}	663	}
653		664
654	void cfperl_main ()	665	void cfperl_main ()
655	{	666	{
656	dSP;	667	dSP;
…		…
1063	maptile::do_load_sync ()	1074	maptile::do_load_sync ()
1064	{	1075	{
1065	CALL_BEGIN (1);	1076	CALL_BEGIN (1);
1066	CALL_ARG (this);	1077	CALL_ARG (this);
1067	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);	1078	CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1068	CALL_END;
1069	}
1070
1071	void
1072	maptile::change_all_map_light (int change)
1073	{
1074	CALL_BEGIN (1);
1075	CALL_ARG (change);
1076	CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1077	CALL_END;	1079	CALL_END;
1078	}	1080	}
1079		1081
1080	void	1082	void
1081	object::enter_exit (object *exit)	1083	object::enter_exit (object *exit)
…		…
1328	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)
1329	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)
1330	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)
1331	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)
1332	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)
1333	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)
1334	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)
1335	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)
1336		1338
1337	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)
1338	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)
…		…
1521	f (GvGP (gv)->gp_cv);	1523	f (GvGP (gv)->gp_cv);
1522	GvCVGEN (gv) = 0;	1524	GvCVGEN (gv) = 0;
1523	GvMULTI_off (gv);	1525	GvMULTI_off (gv);
1524	# undef f	1526	# undef f
1525		1527
1526
1527	void _connect_to_perl ()	1528	void _connect_to_perl ()
1528		1529
1529	void _recalc_want ()	1530	void _recalc_want ()
1530		1531
		1532	# not used by default anymore
1531	void _global_reattach ()	1533	void _global_reattach ()
1532	CODE:	1534	CODE:
1533	{	1535	{
1534	// reattach to all attachable objects in the game.	1536	// reattach to all attachable objects in the game.
1535	for_all_clients (ns)	1537	for_all_clients (ns)
…		…
1578	len -= 3;	1580	len -= 3;
1579	}	1581	}
1580		1582
1581	SvCUR_set (data_sv, dst - SvPVX (data_sv));	1583	SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582	}	1584	}
		1585
		1586	void init_anim ()
		1587
		1588	void init_globals ()
		1589
		1590	void init_experience ()
		1591
		1592	void init_attackmess ()
		1593
		1594	void init_dynamic ()
		1595
		1596	void load_settings ()
		1597
		1598	void load_materials ()
		1599
		1600	void init_uuid ()
		1601	CODE:
		1602	UUID::init ();
		1603
		1604	void init_signals ()
		1605
		1606	void init_commands ()
		1607
		1608	void init_skills ()
		1609
		1610	void init_beforeplay ()
1583		1611
1584	void evthread_start (int aiofd)	1612	void evthread_start (int aiofd)
1585		1613
1586	void cede_to_tick ()	1614	void cede_to_tick ()
1587	CODE:	1615	CODE:
…		…
1756	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)));
1757	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)));
1758	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)));
1759	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)));
1760	#endif	1788	#endif
1761	EXTEND (SP, 2*2);	1789	EXTEND (SP, 5*2);
1762	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)));
1763	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)));
1764	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)));
1765	}	1795	}
1766		1796
1767	int find_animation (utf8_string text)	1797	int find_animation (utf8_string text)
1768	PROTOTYPE: $	1798	PROTOTYPE: $
1769		1799
…		…
2209	pl->ob->stats.hp = pl->ob->stats.maxhp;	2239	pl->ob->stats.hp = pl->ob->stats.maxhp;
2210	pl->ob->stats.sp = pl->ob->stats.maxsp;	2240	pl->ob->stats.sp = pl->ob->stats.maxsp;
2211	pl->ob->stats.grace = pl->ob->stats.maxgrace;	2241	pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212	pl->orig_stats = pl->ob->stats;	2242	pl->orig_stats = pl->ob->stats;
2213		2243
2214	void clear_los (player *pl)	2244	# should only be temporary
		2245	void esrv_new_player (player *pl)
2215		2246
		2247	#d# TODO: replace by blocked_los accessor, fix code using this
2216	bool	2248	bool
2217	cell_visible (player *pl, int dx, int dy)	2249	cell_visible (player *pl, int dx, int dy)
2218	CODE:	2250	CODE:
2219	RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2	2251	RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2220	&& !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2221	OUTPUT:	2252	OUTPUT:
2222	RETVAL	2253	RETVAL
2223		2254
2224	void	2255	void
2225	send (player pl, SV packet)	2256	send (player pl, SV packet)
…		…
2293	}	2324	}
2294		2325
2295	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|	2326	INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h \|
2296		2327
2297	void	2328	void
		2329	adjust_daylight ()
		2330	CODE:
		2331	maptile::adjust_daylight ();
		2332
		2333	void
2298	maptile::instantiate ()	2334	maptile::instantiate ()
2299		2335
2300	maptile *new ()	2336	maptile *new ()
2301	PROTOTYPE:	2337	PROTOTYPE:
2302	CODE:	2338	CODE:
…		…
2481	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)
2482	XPUSHs (sv_2mortal (to_sv (o)));	2518	XPUSHs (sv_2mortal (to_sv (o)));
2483	}	2519	}
2484		2520
2485	SV *	2521	SV *
2486	bot_at (maptile *obj, unsigned int x, unsigned int y)	2522	bot_at (maptile *map, unsigned int x, unsigned int y)
2487	PROTOTYPE: $$$	2523	PROTOTYPE: $$$
2488	ALIAS:	2524	ALIAS:
2489	top_at = 1	2525	top_at = 1
2490	flags_at = 2	2526	flags_at = 2
2491	light_at = 3	2527	light_at = 3
2492	move_block_at = 4	2528	move_block_at = 4
2493	move_slow_at = 5	2529	move_slow_at = 5
2494	move_on_at = 6	2530	move_on_at = 6
2495	move_off_at = 7	2531	move_off_at = 7
2496	INIT:
2497	if (x >= obj->width \|\| y >= obj->height) XSRETURN_UNDEF;
2498	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
2499	switch (ix)	2544	switch (ix)
2500	{	2545	{
2501	case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break;	2546	case 0: RETVAL = to_sv (ms.bot ); break;
2502	case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break;	2547	case 1: RETVAL = to_sv (ms.top ); break;
2503	case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break;	2548	case 2: RETVAL = newSVuv (ms.flags_ ); break;
2504	case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break;	2549	case 3: RETVAL = newSViv (ms.light ); break;
2505	case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break;	2550	case 4: RETVAL = newSVuv (ms.move_block); break;
2506	case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break;	2551	case 5: RETVAL = newSVuv (ms.move_slow ); break;
2507	case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break;	2552	case 6: RETVAL = newSVuv (ms.move_on ); break;
2508	case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break;	2553	case 7: RETVAL = newSVuv (ms.move_off ); break;
2509	}	2554	}
		2555	}
2510	OUTPUT: RETVAL	2556	OUTPUT: RETVAL
2511		2557
2512	void fix_walls (maptile *map, int x, int y)	2558	void fix_walls (maptile *map, int x, int y)
2513		2559
2514	void fix_walls_around (maptile *map, int x, int y)	2560	void fix_walls_around (maptile *map, int x, int y)

Diff Legend

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

Comparing deliantra/server/server/cfperl.xs (file contents): Revision 1.302 by root, Mon Sep 22 23:57:48 2008 UTC vs. Revision 1.312 by root, Tue Dec 23 06:58:24 2008 UTC

Diff Legend

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.312 by root, Tue Dec 23 06:58:24 2008 UTC