Mercurial > hg > early-roguelike

comparison xrogue/wear.c @ 239:837044d2c362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.
author John "Elwin" Edwards
date Fri, 11 Mar 2016 19:47:52 -0500
parents 7c1cb43f346e
children
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
326 case MM_G_OGRE: 326 case MM_G_OGRE:
327 case MM_FUMBLE: 327 case MM_FUMBLE:
328 msg("Wearing %s", inv_name(obj,TRUE)); 328 msg("Wearing %s", inv_name(obj,TRUE));
329 cur_misc[WEAR_GAUNTLET] = obj; 329 cur_misc[WEAR_GAUNTLET] = obj;
330 if (obj->o_which == MM_FUMBLE) 330 if (obj->o_which == MM_FUMBLE)
331 start_daemon(fumble, (VOID *)NULL, AFTER); 331 start_daemon(fumble, NULL, AFTER);
332 /* 332 /*
333 * the jewel of attacks does an aggavate monster 333 * the jewel of attacks does an aggavate monster
334 */ 334 */
335 when MM_JEWEL: 335 when MM_JEWEL:
336 msg("Wearing %s",inv_name(obj,TRUE)); 336 msg("Wearing %s",inv_name(obj,TRUE));
356 */ 356 */
357 when MM_STRANGLE: 357 when MM_STRANGLE:
358 msg("Wearing %s",inv_name(obj,TRUE)); 358 msg("Wearing %s",inv_name(obj,TRUE));
359 cur_misc[WEAR_NECKLACE] = obj; 359 cur_misc[WEAR_NECKLACE] = obj;
360 msg("The necklace is beginning to strangle you!"); 360 msg("The necklace is beginning to strangle you!");
361 start_daemon(strangle, (VOID *)NULL, AFTER); 361 start_daemon(strangle, NULL, AFTER);
362 otherwise: 362 otherwise:
363 msg("What a strange item you have!"); 363 msg("What a strange item you have!");
364 } 364 }
365 status(FALSE); 365 status(FALSE);
366 if (m_know[obj->o_which] && m_guess[obj->o_which]) { 366 if (m_know[obj->o_which] && m_guess[obj->o_which]) {