Mercurial > hg > early-roguelike

comparison arogue7/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 e1cd27c5464f
children
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
325 case MM_G_OGRE: 325 case MM_G_OGRE:
326 case MM_FUMBLE: 326 case MM_FUMBLE:
327 msg("Wearing %s", inv_name(obj,TRUE)); 327 msg("Wearing %s", inv_name(obj,TRUE));
328 cur_misc[WEAR_GAUNTLET] = obj; 328 cur_misc[WEAR_GAUNTLET] = obj;
329 if (obj->o_which == MM_FUMBLE) 329 if (obj->o_which == MM_FUMBLE)
330 start_daemon(fumble, 0, AFTER); 330 start_daemon(fumble, NULL, AFTER);
331 /* 331 /*
332 * the jewel of attacks does an aggavate monster 332 * the jewel of attacks does an aggavate monster
333 */ 333 */
334 when MM_JEWEL: 334 when MM_JEWEL:
335 msg("Wearing %s",inv_name(obj,TRUE)); 335 msg("Wearing %s",inv_name(obj,TRUE));
349 */ 349 */
350 when MM_STRANGLE: 350 when MM_STRANGLE:
351 msg("Wearing %s",inv_name(obj,TRUE)); 351 msg("Wearing %s",inv_name(obj,TRUE));
352 cur_misc[WEAR_NECKLACE] = obj; 352 cur_misc[WEAR_NECKLACE] = obj;
353 msg("The necklace is beginning to strangle you!"); 353 msg("The necklace is beginning to strangle you!");
354 start_daemon(strangle, 0, AFTER); 354 start_daemon(strangle, NULL, AFTER);
355 otherwise: 355 otherwise:
356 msg("What a strange item you have!"); 356 msg("What a strange item you have!");
357 } 357 }
358 status(FALSE); 358 status(FALSE);
359 if (m_know[obj->o_which] && m_guess[obj->o_which]) { 359 if (m_know[obj->o_which] && m_guess[obj->o_which]) {