Navigation

← Previous Changeset
Next Changeset →

Changeset 653

Timestamp:

01/29/08 04:42:33 (7 months ago)

Author:

takkaria

Message:

Further work on #430:

Clean up object_desc() calls by using the new ODESC_* constants.
Add "mode 1" to object_desc() again to only display basename + combat bonuses.

Files:

trunk/src/attack.c (modified) (2 diffs)
trunk/src/cmd-obj.c (modified) (3 diffs)
trunk/src/cmd1.c (modified) (2 diffs)
trunk/src/cmd3.c (modified) (2 diffs)
trunk/src/cmd4.c (modified) (1 diff)
trunk/src/death.c (modified) (1 diff)
trunk/src/dungeon.c (modified) (3 diffs)
trunk/src/files.c (modified) (3 diffs)
trunk/src/history.c (modified) (1 diff)
trunk/src/main-gtk.c (modified) (1 diff)
trunk/src/melee1.c (modified) (2 diffs)
trunk/src/melee2.c (modified) (1 diff)
trunk/src/obj-desc.c (modified) (3 diffs)
trunk/src/obj-info.c (modified) (1 diff)
trunk/src/obj-make.c (modified) (1 diff)
trunk/src/object.h (modified) (1 diff)
trunk/src/object1.c (modified) (6 diffs)
trunk/src/object2.c (modified) (6 diffs)
trunk/src/spells1.c (modified) (4 diffs)
trunk/src/spells2.c (modified) (5 diffs)
trunk/src/squelch.c (modified) (1 diff)
trunk/src/store.c (modified) (7 diffs)
trunk/src/wiz-spoil.c (modified) (3 diffs)
trunk/src/wizard.c (modified) (1 diff)
trunk/src/xtra2.c (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/attack.c

r567	r653
675	675
676	676	/* Describe the object */
677		object_desc(o_name, sizeof(o_name), i_ptr, FALSE, 3);
	677	object_desc(o_name, sizeof(o_name), i_ptr, FALSE, ODESC_FULL);
678	678
679	679	/* Find the color and symbol for the object for throwing */
…	…
964	964
965	965	/* Description */
966		object_desc(o_name, sizeof(o_name), i_ptr, FALSE, 3);
	966	object_desc(o_name, sizeof(o_name), i_ptr, FALSE, ODESC_FULL);
967	967
968	968	/* Find the color and symbol for the object for throwing */

trunk/src/cmd-obj.c

r602	r653
45	45	char tmp[80] = "";
46	46
47		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	47	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
48	48	msg_format("Inscribing %s.", o_name);
49	49	message_flush();
…	…
121	121	{
122	122	/* Message */
123		object_desc(o_name, sizeof(o_name), equip_o_ptr, FALSE, 0);
	123	object_desc(o_name, sizeof(o_name), equip_o_ptr, FALSE, ODESC_BASE);
124	124	msg_format("The %s you are %s appears to be cursed.",
125	125	o_name, describe_use(slot));
…	…
132	132	{
133	133	/* Prompt */
134		object_desc(o_name, sizeof(o_name), equip_o_ptr, TRUE, 3);
	134	object_desc(o_name, sizeof(o_name), equip_o_ptr, TRUE, ODESC_FULL);
135	135
136	136	/* Forget it */

trunk/src/cmd1.c

r636	r653
279	279	{
280	280	/* Describe the object */
281		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	281	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
282	282
283	283	/* Message */
…	…
427	427
428	428	/* Describe the object. Less detail if blind. */
429		if (blind) object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 0);
430		else object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	429	if (blind) object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_BASE);
	430	else object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
431	431
432	432	/* Message */

trunk/src/cmd3.c

r617	r653
183	183
184	184	/* Describe the result */
185		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	185	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
186	186
187	187	/* Message */
…	…
278	278
279	279	/* Describe the destroyed object */
280		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	280	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
281	281
282	282	/* Verify destruction */

trunk/src/cmd4.c

r636	r653
1192	1192
1193	1193	/* Get its name */
1194		object_desc_spoil(o_name, namelen, o_ptr, TRUE, 0);
	1194	object_desc_spoil(o_name, namelen, o_ptr, TRUE, ODESC_BASE);
1195	1195	}
1196	1196

trunk/src/death.c

r636	r653
282	282
283	283	/* Get the object description */
284		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	284	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
285	285
286	286	/* Get the inventory color */

trunk/src/dungeon.c

r640	r653
207	207	else
208	208	{
209		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	209	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
210	210
211	211	if (i >= INVEN_WIELD)
…	…
406	406	{
407	407	/* Describe (briefly) */
408		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	408	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
409	409
410	410	/* Disturb the player */
…	…
1231	1231
1232	1232	/* Describe */
1233		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	1233	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
1234	1234
1235	1235	/* Message */

trunk/src/files.c

r635	r653
1910	1910	for (i = INVEN_WIELD; i < INVEN_TOTAL; i++)
1911	1911	{
1912		object_desc(o_name, sizeof(o_name), &inventory[i], TRUE, 3);
	1912	object_desc(o_name, sizeof(o_name), &inventory[i], TRUE, ODESC_FULL);
1913	1913
1914	1914	file_putf(fp, "%c) %s\n", index_to_label(i), o_name);
…	…
1925	1925	if (!inventory[i].k_idx) break;
1926	1926
1927		object_desc(o_name, sizeof(o_name), &inventory[i], TRUE, 3);
	1927	object_desc(o_name, sizeof(o_name), &inventory[i], TRUE, ODESC_FULL);
1928	1928
1929	1929	file_putf(fp, "%c) %s\n", index_to_label(i), o_name);
…	…
1942	1942	for (i = 0; i < st_ptr->stock_num; i++)
1943	1943	{
1944		object_desc(o_name, sizeof(o_name), &st_ptr->stock[i], TRUE, 3);
	1944	object_desc(o_name, sizeof(o_name), &st_ptr->stock[i], TRUE, ODESC_FULL);
1945	1945	file_putf(fp, "%c) %s\n", I2A(i), o_name);
1946	1946

trunk/src/history.c

r636	r653
236	236	object_wipe(o_ptr);
237	237	make_fake_artifact(o_ptr, a_idx);
238		object_desc_spoil(o_name, sizeof(o_name), o_ptr, TRUE, 0);
	238	object_desc_spoil(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_BASE);
239	239	strnfmt(buf, sizeof(buf), "Found %s", o_name);
240	240

trunk/src/main-gtk.c

r648	r653
2088	2088	{
2089	2089	/* Obtain an item description */
2090		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	2090	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
2091	2091
2092	2092	/* Obtain the length of the description */

trunk/src/melee1.c

r522	r653
676	676
677	677	/* Get a description */
678		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 3);
	678	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_FULL);
679	679
680	680	/* Message */
…	…
739	739
740	740	/* Get a description */
741		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	741	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
742	742
743	743	/* Message */

trunk/src/melee2.c

r633	r653
3895	3895
3896	3896	/* Get the object name */
3897		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	3897	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
3898	3898
3899	3899	/* Get the monster name */

trunk/src/obj-desc.c

r652	r653
747	747	/ Append things depending on mode /
748	748
749		if (mode == OD~~_BASENAM~~E)
	749	if (mode == ODESC_BASE)
750	750	return end;
751	751
…	…
757	757	end = obj_desc_combat(o_ptr, buf, max, end);
758	758
	759	if (mode == ODESC_COMBAT)
	760	return end;
	761
759	762	if (known)
760	763	{
…	…
767	770
768	771	/* Add squelch marker */
769		if (mode == OD_ALL)
	772	if (mode == ODESC_FULL)
770	773	{
771	774	if (!OPT(hide_squelchable) && squelch_item_ok(o_ptr))

trunk/src/obj-info.c

r613	r653
599	599
600	600	/* Object name */
601		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	601	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
602	602	text_out_c(TERM_L_BLUE, "%^s\n", o_name);
603	603

trunk/src/obj-make.c

r633	r653
215	215
216	216	/* Describe */
217		object_desc_spoil(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	217	object_desc_spoil(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
218	218
219	219	/* Artifact */

trunk/src/object.h

r652	r653
90	90	enum
91	91	{
92		ODESC_BASENAME = 0,
93		ODESC_ALL = 3,
94		ODESC_INSTORE = 4
	92	ODESC_BASE = 0,
	93	ODESC_COMBAT = 1,
	94	ODESC_FULL = 3,
	95	ODESC_STORE = 4
95	96	};
96	97

trunk/src/object1.c

r652	r653
735	735
736	736	/* Obtain an item description */
737		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	737	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
738	738
739	739	/* Obtain the length of the description */
…	…
805	805
806	806	/* Obtain an item description */
807		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	807	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
808	808
809	809	/* Obtain the length of the description */
…	…
896	896
897	897	/* Describe the object */
898		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	898	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
899	899
900	900	/* Hack -- enforce max length */
…	…
1000	1000
1001	1001	/* Description */
1002		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	1002	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
1003	1003
1004	1004	/* Truncate the description */
…	…
1126	1126
1127	1127	/* Describe the object */
1128		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	1128	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
1129	1129
1130	1130	/* Hack -- enforce max length */
…	…
1217	1217
1218	1218	/* Describe */
1219		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	1219	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
1220	1220
1221	1221	/* Prompt */

trunk/src/object2.c

r636	r653
1470	1470
1471	1471	/* Describe object */
1472		object_desc(o_name, sizeof(o_name), j_ptr, FALSE, 0);
	1472	object_desc(o_name, sizeof(o_name), j_ptr, FALSE, ODESC_BASE);
1473	1473
1474	1474
…	…
1856	1856	{
1857	1857	/* Get a description */
1858		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 3);
	1858	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_FULL);
1859	1859
1860	1860	/* Print a message */
…	…
1864	1864	{
1865	1865	/* Get a description */
1866		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	1866	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
1867	1867
1868	1868	/* Print a message */
…	…
2002	2002
2003	2003	/* Get a description */
2004		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	2004	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
2005	2005
2006	2006	/* Print a message */
…	…
2313	2313
2314	2314	/* Describe the object */
2315		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	2315	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
2316	2316
2317	2317	/* Took off weapon */
…	…
2407	2407
2408	2408	/* Describe local object */
2409		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	2409	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
2410	2410
2411	2411	/* Message */

trunk/src/spells1.c

r522	r653
863	863	{
864	864	/* Get a description */
865		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 3);
	865	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_FULL);
866	866
867	867	/* Message */
…	…
941	941
942	942	/* Describe */
943		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	943	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
944	944
945	945	/* Extract the flags */
…	…
1327	1327
1328	1328	/* Describe the object */
1329		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	1329	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
1330	1330
1331	1331
…	…
2022	2022	{
2023	2023	obvious = TRUE;
2024		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	2024	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
2025	2025	}
2026	2026

trunk/src/spells2.c

r639	r653
1843	1843
1844	1844	/* Description */
1845		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	1845	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
1846	1846
1847	1847	/* Describe */
…	…
3418	3418
3419	3419	/* Describe */
3420		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 3);
	3420	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_FULL);
3421	3421
3422	3422	/* Attempt a saving throw for artifacts */
…	…
3482	3482
3483	3483	/* Describe */
3484		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 3);
	3484	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_FULL);
3485	3485
3486	3486	/* Attempt a saving throw */
…	…
3545	3545	char o_name[80];
3546	3546
3547		object_desc(o_name, sizeof(o_name), o_ptr, FALSE, 0);
	3547	object_desc(o_name, sizeof(o_name), o_ptr, FALSE, ODESC_BASE);
3548	3548
3549	3549	switch (brand_type)
…	…
3809	3809
3810	3810	/* Description */
3811		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	3811	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
3812	3812
3813	3813	/* Possibly play a sound depending on object quality. */

trunk/src/squelch.c

r603	r653
208	208
209	209	/* Get an object description */
210		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	210	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
211	211
212	212	if (note[0] != 0)

trunk/src/store.c

r636	r653
1665	1665
1666	1666	/* Describe the object */
1667		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 4);
	1667	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_STORE);
1668	1668
1669	1669	/* Display the object */
…	…
1958	1958
1959	1959	/* Describe the object (fully) */
1960		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	1960	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
1961	1961
1962	1962	/* Attempt to buy it */
…	…
2009	2009
2010	2010	/* Message */
2011		object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, 3);
	2011	object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, ODESC_FULL);
2012	2012	msg_format("You have %s (%c).", o_name, index_to_label(item_new));
2013	2013	store_flags \|= STORE_KEEP_PROMPT;
…	…
2069	2069
2070	2070	/* Describe just the result */
2071		object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, 3);
	2071	object_desc(o_name, sizeof(o_name), &inventory[item_new], TRUE, ODESC_FULL);
2072	2072
2073	2073	/* Message */
…	…
2179	2179
2180	2180	/* Get a full description */
2181		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	2181	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
2182	2182
2183	2183
…	…
2264	2264
2265	2265	/* Get the description all over again */
2266		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	2266	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
2267	2267
2268	2268	/* Describe the result (in message buffer) */
…	…
2394	2394
2395	2395	/* Describe it */
2396		object_desc(o_name, sizeof(o_name), i_ptr, TRUE, 3);
	2396	object_desc(o_name, sizeof(o_name), i_ptr, TRUE, ODESC_FULL);
2397	2397
2398	2398	/* Message */

trunk/src/wiz-spoil.c

r595	r653
155	155	/* Make known */
156	156	i_ptr->ident \|= (IDENT_KNOWN);
157
	157
158	158	/* Value */
159	159	(*val) = object_value(i_ptr);
…	…
163	163	/* Description (too brief) */
164	164	if (buf)
165		object_desc_spoil(buf, buf_len, i_ptr, FALSE, 0);
	165	object_desc_spoil(buf, buf_len, i_ptr, FALSE, ODESC_BASE);
166	166
167	167	/* Weight */
…	…
487	487
488	488	/* Grab artifact name */
489		object_desc_spoil(buf, sizeof(buf), i_ptr, TRUE, 1);
	489	object_desc_spoil(buf, sizeof(buf), i_ptr, TRUE, ODESC_COMBAT);
490	490
491	491	/* Print name and underline */

trunk/src/wizard.c

r595	r653
306	306
307	307	/* Describe fully */
308		object_desc_spoil(buf, sizeof(buf), o_ptr, TRUE, 3);
	308	object_desc_spoil(buf, sizeof(buf), o_ptr, TRUE, ODESC_FULL);
309	309
310	310	prt(buf, 2, j);

trunk/src/xtra2.c

r636	r653
2597	2597
2598	2598	/* Obtain an object description */
2599		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	2599	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
2600	2600
2601	2601	/* Describe the object */
…	…
2706	2706
2707	2707	/* Obtain an object description */
2708		object_desc(o_name, sizeof(o_name), o_ptr, TRUE, 3);
	2708	object_desc(o_name, sizeof(o_name), o_ptr, TRUE, ODESC_FULL);
2709	2709
2710	2710	/* Describe the object */

Navigation

Changeset 653

Legend:

Download in other formats: