[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC vs.
Revision 1.284 by root, Sat Jun 27 08:35:03 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
792		792
793	object::object ()	793	object::object ()
794	{	794	{
795	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
796		796
797	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
798	face = blank_face;	798	face = blank_face;
799	}	799	}
800		800
801	object::~object ()	801	object::~object ()
802	{	802	{
…		…
963		963
964	void	964	void
965	object::do_destroy ()	965	object::do_destroy ()
966	{	966	{
967	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	968	remove_link ();
969		969
970	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	971	remove_friendly_object (this);
972		972
973	remove ();	973	remove ();
…		…
1297		1297
1298	if (object *more = op->more)	1298	if (object *more = op->more)
1299	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1300	return 0;	1300	return 0;
1301		1301
1302	CLEAR_FLAG (op, FLAG_REMOVED);	1302	op->flag [FLAG_REMOVED] = false;
1303		1303	op->env = 0;
1304	op->map = newmap;	1304	op->map = newmap;
		1305
1305	mapspace &ms = op->ms ();	1306	mapspace &ms = op->ms ();
1306		1307
1307	/* this has to be done after we translate the coordinates.	1308	/* this has to be done after we translate the coordinates.
1308	*/	1309	*/
1309	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331	abort ();	1332	abort ();
1332	}	1333	}
1333		1334
1334	if (!originator->is_on_map ())	1335	if (!originator->is_on_map ())
		1336	{
1335	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1337	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336	op->debug_desc (), originator->debug_desc ());	1338	op->debug_desc (), originator->debug_desc ());
		1339	abort ();
		1340	}
1337		1341
1338	op->above = originator;	1342	op->above = originator;
1339	op->below = originator->below;	1343	op->below = originator->below;
1340	originator->below = op;	1344	originator->below = op;
1341		1345
…		…
1494	/* this function inserts an object in the map, but if it	1498	/* this function inserts an object in the map, but if it
1495	* finds an object of its own type, it'll remove that one first.	1499	* finds an object of its own type, it'll remove that one first.
1496	* op is the object to insert it under: supplies x and the map.	1500	* op is the object to insert it under: supplies x and the map.
1497	*/	1501	*/
1498	void	1502	void
1499	replace_insert_ob_in_map (const char arch_string, object op)	1503	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500	{	1504	{
1501	/* first search for itself and remove any old instances */	1505	/* first search for itself and remove any old instances */
1502		1506
1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1507	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1508	if (tmp->arch->archname == archname) /* same archetype */
1505	tmp->destroy ();	1509	tmp->destroy ();
1506		1510
1507	object *tmp = arch_to_object (archetype::find (arch_string));	1511	object *tmp = arch_to_object (archetype::find (archname));
1508		1512
1509	tmp->x = op->x;	1513	tmp->x = op->x;
1510	tmp->y = op->y;	1514	tmp->y = op->y;
1511		1515
1512	insert_ob_in_map (tmp, op->map, op, 0);	1516	insert_ob_in_map (tmp, op->map, op, 0);
…		…
2057	* there is capable of.	2061	* there is capable of.
2058	*/	2062	*/
2059	int	2063	int
2060	find_dir (maptile m, int x, int y, object exclude)	2064	find_dir (maptile m, int x, int y, object exclude)
2061	{	2065	{
2062	int i, max = SIZEOFFREE, mflags;	2066	int max = SIZEOFFREE, mflags;
2063
2064	sint16 nx, ny;
2065	object *tmp;
2066	maptile *mp;
2067
2068	MoveType blocked, move_type;	2067	MoveType move_type;
2069		2068
2070	if (exclude && exclude->head_ () != exclude)	2069	if (exclude && exclude->head_ () != exclude)
2071	{	2070	{
2072	exclude = exclude->head;	2071	exclude = exclude->head;
2073	move_type = exclude->move_type;	2072	move_type = exclude->move_type;
…		…
2076	{	2075	{
2077	/* If we don't have anything, presume it can use all movement types. */	2076	/* If we don't have anything, presume it can use all movement types. */
2078	move_type = MOVE_ALL;	2077	move_type = MOVE_ALL;
2079	}	2078	}
2080		2079
2081	for (i = 1; i < max; i++)	2080	for (int i = 1; i < max; i++)
2082	{	2081	{
2083	mp = m;	2082	mapxy pos (m, x, y);
2084	nx = x + freearr_x[i];	2083	pos.move (i);
2085	ny = y + freearr_y[i];
2086		2084
2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2085	if (!pos.normalise ())
2088
2089	if (mflags & P_OUT_OF_MAP)
2090	max = maxfree[i];	2086	max = maxfree[i];
2091	else	2087	else
2092	{	2088	{
2093	mapspace &ms = mp->at (nx, ny);	2089	mapspace &ms = *pos;
2094		2090
2095	blocked = ms.move_block;
2096
2097	if ((move_type & blocked) == move_type)	2091	if ((move_type & ms.move_block) == move_type)
2098	max = maxfree[i];	2092	max = maxfree [i];
2099	else if (mflags & P_IS_ALIVE)	2093	else if (ms.flags () & P_IS_ALIVE)
2100	{	2094	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2095	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())	2096	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2103	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2097	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;
2105
2106	if (tmp)
2107	return freedir[i];	2098	return freedir [i];
2108	}	2099	}
2109	}	2100	}
2110	}	2101	}
2111		2102
2112	return 0;	2103	return 0;
…		…
2187	* This basically means that if direction is 15, then it could either go	2178	* This basically means that if direction is 15, then it could either go
2188	* direction 4, 14, or 16 to get back to where we are.	2179	* direction 4, 14, or 16 to get back to where we are.
2189	* Moved from spell_util.c to object.c with the other related direction	2180	* Moved from spell_util.c to object.c with the other related direction
2190	* functions.	2181	* functions.
2191	*/	2182	*/
2192	int reduction_dir[SIZEOFFREE][3] = {	2183	const int reduction_dir[SIZEOFFREE][3] = {
2193	{0, 0, 0}, /* 0 */	2184	{0, 0, 0}, /* 0 */
2194	{0, 0, 0}, /* 1 */	2185	{0, 0, 0}, /* 1 */
2195	{0, 0, 0}, /* 2 */	2186	{0, 0, 0}, /* 2 */
2196	{0, 0, 0}, /* 3 */	2187	{0, 0, 0}, /* 3 */
2197	{0, 0, 0}, /* 4 */	2188	{0, 0, 0}, /* 4 */
…		…
2335	return tmp;	2326	return tmp;
2336		2327
2337	return 0;	2328	return 0;
2338	}	2329	}
2339		2330
2340	const shstr &	2331	shstr_tmp
2341	object::kv_get (const shstr &key) const	2332	object::kv_get (shstr_tmp key) const
2342	{	2333	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2344	if (kv->key == key)	2335	if (kv->key == key)
2345	return kv->value;	2336	return kv->value;
2346		2337
2347	return shstr_null;	2338	return shstr ();
2348	}	2339	}
2349		2340
2350	void	2341	void
2351	object::kv_set (const shstr &key, const shstr &value)	2342	object::kv_set (shstr_tmp key, shstr_tmp value)
2352	{	2343	{
2353	for (key_value *kv = key_values; kv; kv = kv->next)	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (kv->key == key)	2345	if (kv->key == key)
2355	{	2346	{
2356	kv->value = value;	2347	kv->value = value;
…		…
2365		2356
2366	key_values = kv;	2357	key_values = kv;
2367	}	2358	}
2368		2359
2369	void	2360	void
2370	object::kv_del (const shstr &key)	2361	object::kv_del (shstr_tmp key)
2371	{	2362	{
2372	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2363	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2373	if ((*kvp)->key == key)	2364	if ((*kvp)->key == key)
2374	{	2365	{
2375	key_value kv = kvp;	2366	key_value kv = kvp;
…		…
2506	container = 0;	2497	container = 0;
2507		2498
2508	// client needs item update to make it work, client bug requires this to be separate	2499	// client needs item update to make it work, client bug requires this to be separate
2509	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
2510		2501
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2513	}	2504	}
2514		2505
2515	if (new_container)	2506	if (new_container)
2516	{	2507	{
…		…
2526	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527	new_container->insert (closer);	2518	new_container->insert (closer);
2528	}	2519	}
2529	#endif	2520	#endif
2530		2521
2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532		2523
2533	// make sure the container is available, client bug requires this to be separate	2524	// make sure the container is available, client bug requires this to be separate
2534	esrv_send_item (this, new_container);	2525	esrv_send_item (this, new_container);
2535		2526
2536	new_container->flag [FLAG_APPLIED] = true;	2527	new_container->flag [FLAG_APPLIED] = true;
…		…
2544	// else if (!old_container->env && contr && contr->ns)	2535	// else if (!old_container->env && contr && contr->ns)
2545	// contr->ns->floorbox_reset ();	2536	// contr->ns->floorbox_reset ();
2546	}	2537	}
2547		2538
2548	object *	2539	object *
2549	object::force_find (const shstr name)	2540	object::force_find (shstr_tmp name)
2550	{	2541	{
2551	/* cycle through his inventory to look for the MARK we want to	2542	/* cycle through his inventory to look for the MARK we want to
2552	* place	2543	* place
2553	*/	2544	*/
2554	for (object *tmp = inv; tmp; tmp = tmp->below)	2545	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2557		2548
2558	return 0;	2549	return 0;
2559	}	2550	}
2560		2551
2561	object *	2552	object *
2562	object::force_add (const shstr name, int duration)	2553	object::force_add (shstr_tmp name, int duration)
2563	{	2554	{
2564	if (object *force = force_find (name))	2555	if (object *force = force_find (name))
2565	force->destroy ();	2556	force->destroy ();
2566		2557
2567	object *force = get_archetype (FORCE_NAME);	2558	object *force = get_archetype (FORCE_NAME);
…		…
2576		2567
2577	return insert (force);	2568	return insert (force);
2578	}	2569	}
2579		2570
2580	void	2571	void
2581	object::play_sound (faceidx sound)	2572	object::play_sound (faceidx sound) const
2582	{	2573	{
2583	if (!sound)	2574	if (!sound)
2584	return;	2575	return;
2585		2576
2586	if (flag [FLAG_REMOVED])	2577	if (is_on_map ())
2587	return;
2588
2589	if (env)
2590	{
2591	if (object *pl = in_player ())
2592	pl->contr->play_sound (sound);
2593	}
2594	else
2595	map->play_sound (sound, x, y);	2578	map->play_sound (sound, x, y);
		2579	else if (object *pl = in_player ())
		2580	pl->contr->play_sound (sound);
		2581	}
		2582
		2583	void
		2584	object::say_msg (const char *msg) const
		2585	{
		2586	if (is_on_map ())
		2587	map->say_msg (msg, x, y);
		2588	else if (object *pl = in_player ())
		2589	pl->contr->play_sound (sound);
2596	}	2590	}
2597		2591
2598	void	2592	void
2599	object::make_noise ()	2593	object::make_noise ()
2600	{	2594	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC vs. Revision 1.284 by root, Sat Jun 27 08:35:03 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC vs.
Revision 1.284 by root, Sat Jun 27 08:35:03 2009 UTC