Mercurial > hg > early-roguelike

comparison arogue7/main.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 3d4252fa2ed3
comparison
equal deleted inserted replaced
232:bac2c81fec78 239:837044d2c362
391 new_level(STARTLEV); /* Draw current level */ 391 new_level(STARTLEV); /* Draw current level */
392 /* 392 /*
393 * Start up daemons and fuses 393 * Start up daemons and fuses
394 */ 394 */
395 start_daemon(doctor, &player, AFTER); 395 start_daemon(doctor, &player, AFTER);
396 fuse(swander, 0, WANDERTIME, AFTER); 396 fuse(swander, NULL, WANDERTIME, AFTER);
397 if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_RANGER) 397 if (player.t_ctype == C_MAGICIAN || player.t_ctype == C_RANGER)
398 fuse(spell_recovery, 0, SPELLTIME, AFTER); 398 fuse(spell_recovery, NULL, SPELLTIME, AFTER);
399 if (player.t_ctype == C_DRUID || player.t_ctype == C_RANGER) 399 if (player.t_ctype == C_DRUID || player.t_ctype == C_RANGER)
400 fuse(chant_recovery, 0, SPELLTIME, AFTER); 400 fuse(chant_recovery, NULL, SPELLTIME, AFTER);
401 if (player.t_ctype == C_CLERIC || player.t_ctype == C_PALADIN) 401 if (player.t_ctype == C_CLERIC || player.t_ctype == C_PALADIN)
402 fuse(prayer_recovery, 0, SPELLTIME, AFTER); 402 fuse(prayer_recovery, NULL, SPELLTIME, AFTER);
403 start_daemon(stomach, 0, AFTER); 403 start_daemon(stomach, NULL, AFTER);
404 if (player.t_ctype == C_THIEF || 404 if (player.t_ctype == C_THIEF ||
405 player.t_ctype == C_ASSASIN || 405 player.t_ctype == C_ASSASIN ||
406 player.t_ctype == C_MONK) 406 player.t_ctype == C_MONK)
407 start_daemon(trap_look, 0, AFTER); 407 start_daemon(trap_look, NULL, AFTER);
408 408
409 /* Does this character have any special knowledge? */ 409 /* Does this character have any special knowledge? */
410 switch (player.t_ctype) { 410 switch (player.t_ctype) {
411 case C_ASSASIN: 411 case C_ASSASIN:
412 /* Assassins automatically recognize poison */ 412 /* Assassins automatically recognize poison */