[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.286 by root, Wed Sep 2 16:54:20 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
328	// the player inventory itself is always visible	328	// the player inventory itself is always visible
329	if (env->is_player ())	329	if (env->is_player ())
330	return env;	330	return env;
331		331
332	// else a player could have our env open	332	// else a player could have our env open
333	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
334		334
335	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	336	// even if our inv is in a player.
337	if (envest->is_on_map ())	337	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
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	{
…		…
831	{	831	{
832	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
833	if (active)	833	if (active)
834	return;	834	return;
835		835
836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839	if (has_active_speed ())	836	if (has_active_speed ())
		837	{
		838	if (flag [FLAG_FREED])
		839	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		840
840	actives.insert (this);	841	actives.insert (this);
		842	}
841	}	843	}
842		844
843	void	845	void
844	object::activate_recursive ()	846	object::activate_recursive ()
845	{	847	{
…		…
963		965
964	void	966	void
965	object::do_destroy ()	967	object::do_destroy ()
966	{	968	{
967	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	970	remove_link ();
969		971
970	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	973	remove_friendly_object (this);
972		974
973	remove ();	975	remove ();
…		…
1297		1299
1298	if (object *more = op->more)	1300	if (object *more = op->more)
1299	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1300	return 0;	1302	return 0;
1301		1303
1302	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1303		1305	op->env = 0;
1304	op->map = newmap;	1306	op->map = newmap;
		1307
1305	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1306		1309
1307	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1308	*/	1311	*/
1309	if (op->nrof && !(flag & INS_NO_MERGE))	1312	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");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331	abort ();	1334	abort ();
1332	}	1335	}
1333		1336
1334	if (!originator->is_on_map ())	1337	if (!originator->is_on_map ())
		1338	{
1335	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1339	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 ());	1340	op->debug_desc (), originator->debug_desc ());
		1341	abort ();
		1342	}
1337		1343
1338	op->above = originator;	1344	op->above = originator;
1339	op->below = originator->below;	1345	op->below = originator->below;
1340	originator->below = op;	1346	originator->below = op;
1341		1347
…		…
1494	/* this function inserts an object in the map, but if it	1500	/* 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.	1501	* 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.	1502	* op is the object to insert it under: supplies x and the map.
1497	*/	1503	*/
1498	void	1504	void
1499	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500	{	1506	{
1501	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1502		1508
1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1505	tmp->destroy ();	1511	tmp->destroy ();
1506		1512
1507	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1508		1514
1509	tmp->x = op->x;	1515	tmp->x = op->x;
1510	tmp->y = op->y;	1516	tmp->y = op->y;
1511		1517
1512	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
2057	* there is capable of.	2063	* there is capable of.
2058	*/	2064	*/
2059	int	2065	int
2060	find_dir (maptile m, int x, int y, object exclude)	2066	find_dir (maptile m, int x, int y, object exclude)
2061	{	2067	{
2062	int i, max = SIZEOFFREE, mflags;	2068	int max = SIZEOFFREE, mflags;
2063
2064	sint16 nx, ny;
2065	object *tmp;
2066	maptile *mp;
2067
2068	MoveType blocked, move_type;	2069	MoveType move_type;
2069		2070
2070	if (exclude && exclude->head_ () != exclude)	2071	if (exclude && exclude->head_ () != exclude)
2071	{	2072	{
2072	exclude = exclude->head;	2073	exclude = exclude->head;
2073	move_type = exclude->move_type;	2074	move_type = exclude->move_type;
…		…
2076	{	2077	{
2077	/* If we don't have anything, presume it can use all movement types. */	2078	/* If we don't have anything, presume it can use all movement types. */
2078	move_type = MOVE_ALL;	2079	move_type = MOVE_ALL;
2079	}	2080	}
2080		2081
2081	for (i = 1; i < max; i++)	2082	for (int i = 1; i < max; i++)
2082	{	2083	{
2083	mp = m;	2084	mapxy pos (m, x, y);
2084	nx = x + freearr_x[i];	2085	pos.move (i);
2085	ny = y + freearr_y[i];
2086		2086
2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	if (!pos.normalise ())
2088
2089	if (mflags & P_OUT_OF_MAP)
2090	max = maxfree[i];	2088	max = maxfree[i];
2091	else	2089	else
2092	{	2090	{
2093	mapspace &ms = mp->at (nx, ny);	2091	mapspace &ms = *pos;
2094		2092
2095	blocked = ms.move_block;
2096
2097	if ((move_type & blocked) == move_type)	2093	if ((move_type & ms.move_block) == move_type)
2098	max = maxfree[i];	2094	max = maxfree [i];
2099	else if (mflags & P_IS_ALIVE)	2095	else if (ms.flags () & P_IS_ALIVE)
2100	{	2096	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2097	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())	2098	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2103	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2099	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;
2105
2106	if (tmp)
2107	return freedir[i];	2100	return freedir [i];
2108	}	2101	}
2109	}	2102	}
2110	}	2103	}
2111		2104
2112	return 0;	2105	return 0;
…		…
2187	* This basically means that if direction is 15, then it could either go	2180	* 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.	2181	* 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	2182	* Moved from spell_util.c to object.c with the other related direction
2190	* functions.	2183	* functions.
2191	*/	2184	*/
2192	int reduction_dir[SIZEOFFREE][3] = {	2185	const int reduction_dir[SIZEOFFREE][3] = {
2193	{0, 0, 0}, /* 0 */	2186	{0, 0, 0}, /* 0 */
2194	{0, 0, 0}, /* 1 */	2187	{0, 0, 0}, /* 1 */
2195	{0, 0, 0}, /* 2 */	2188	{0, 0, 0}, /* 2 */
2196	{0, 0, 0}, /* 3 */	2189	{0, 0, 0}, /* 3 */
2197	{0, 0, 0}, /* 4 */	2190	{0, 0, 0}, /* 4 */
…		…
2335	return tmp;	2328	return tmp;
2336		2329
2337	return 0;	2330	return 0;
2338	}	2331	}
2339		2332
2340	const shstr &	2333	shstr_tmp
2341	object::kv_get (const shstr &key) const	2334	object::kv_get (shstr_tmp key) const
2342	{	2335	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2344	if (kv->key == key)	2337	if (kv->key == key)
2345	return kv->value;	2338	return kv->value;
2346		2339
2347	return shstr_null;	2340	return shstr ();
2348	}	2341	}
2349		2342
2350	void	2343	void
2351	object::kv_set (const shstr &key, const shstr &value)	2344	object::kv_set (shstr_tmp key, shstr_tmp value)
2352	{	2345	{
2353	for (key_value *kv = key_values; kv; kv = kv->next)	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (kv->key == key)	2347	if (kv->key == key)
2355	{	2348	{
2356	kv->value = value;	2349	kv->value = value;
…		…
2365		2358
2366	key_values = kv;	2359	key_values = kv;
2367	}	2360	}
2368		2361
2369	void	2362	void
2370	object::kv_del (const shstr &key)	2363	object::kv_del (shstr_tmp key)
2371	{	2364	{
2372	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2365	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2373	if ((*kvp)->key == key)	2366	if ((*kvp)->key == key)
2374	{	2367	{
2375	key_value kv = kvp;	2368	key_value kv = kvp;
…		…
2506	container = 0;	2499	container = 0;
2507		2500
2508	// client needs item update to make it work, client bug requires this to be separate	2501	// client needs item update to make it work, client bug requires this to be separate
2509	esrv_update_item (UPD_FLAGS, this, old_container);	2502	esrv_update_item (UPD_FLAGS, this, old_container);
2510		2503
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2504	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512	play_sound (sound_find ("chest_close"));	2505	play_sound (sound_find ("chest_close"));
2513	}	2506	}
2514		2507
2515	if (new_container)	2508	if (new_container)
2516	{	2509	{
…		…
2526	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2519	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527	new_container->insert (closer);	2520	new_container->insert (closer);
2528	}	2521	}
2529	#endif	2522	#endif
2530		2523
2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2524	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532		2525
2533	// make sure the container is available, client bug requires this to be separate	2526	// make sure the container is available, client bug requires this to be separate
2534	esrv_send_item (this, new_container);	2527	esrv_send_item (this, new_container);
2535		2528
2536	new_container->flag [FLAG_APPLIED] = true;	2529	new_container->flag [FLAG_APPLIED] = true;
…		…
2544	// else if (!old_container->env && contr && contr->ns)	2537	// else if (!old_container->env && contr && contr->ns)
2545	// contr->ns->floorbox_reset ();	2538	// contr->ns->floorbox_reset ();
2546	}	2539	}
2547		2540
2548	object *	2541	object *
2549	object::force_find (const shstr name)	2542	object::force_find (shstr_tmp name)
2550	{	2543	{
2551	/* cycle through his inventory to look for the MARK we want to	2544	/* cycle through his inventory to look for the MARK we want to
2552	* place	2545	* place
2553	*/	2546	*/
2554	for (object *tmp = inv; tmp; tmp = tmp->below)	2547	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2557		2550
2558	return 0;	2551	return 0;
2559	}	2552	}
2560		2553
2561	object *	2554	object *
2562	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2563	{	2556	{
2564	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2565	force->destroy ();	2558	force->destroy ();
2566		2559
2567	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
…		…
2576		2569
2577	return insert (force);	2570	return insert (force);
2578	}	2571	}
2579		2572
2580	void	2573	void
2581	object::play_sound (faceidx sound)	2574	object::play_sound (faceidx sound) const
2582	{	2575	{
2583	if (!sound)	2576	if (!sound)
2584	return;	2577	return;
2585		2578
2586	if (flag [FLAG_REMOVED])	2579	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);	2580	map->play_sound (sound, x, y);
		2581	else if (object *pl = in_player ())
		2582	pl->contr->play_sound (sound);
		2583	}
		2584
		2585	void
		2586	object::say_msg (const char *msg) const
		2587	{
		2588	if (is_on_map ())
		2589	map->say_msg (msg, x, y);
		2590	else if (object *pl = in_player ())
		2591	pl->contr->play_sound (sound);
2596	}	2592	}
2597		2593
2598	void	2594	void
2599	object::make_noise ()	2595	object::make_noise ()
2600	{	2596	{

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.286 by root, Wed Sep 2 16:54:20 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.286 by root, Wed Sep 2 16:54:20 2009 UTC