Mercurial > hg > early-roguelike

diff rogue4/fight.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 0990adf580ee
children e7aab31362af
line wrap: on
line diff
--- a/rogue4/fight.c	Tue Mar 08 19:45:41 2016 -0500
+++ b/rogue4/fight.c	Fri Mar 11 19:47:52 2016 -0500
@@ -22,8 +22,8 @@
 };
 
 bool roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl);
-void hit(char *er, char *ee);
-void miss(char *er, char *ee);
+void hit(const char *er, const char *ee);
+void miss(const char *er, const char *ee);
 int str_plus(str_t str);
 int add_dam(str_t str);
 void thunk(THING *weap, const char *mname);
@@ -446,7 +446,7 @@
  *	The print name of a combatant
  */
 char *
-prname(char *who, bool upper)
+prname(const char *who, bool upper)
 {
     static char tbuf[MAXSTR];
 
@@ -470,7 +470,7 @@
  *	Print a message to indicate a succesful hit
  */
 void
-hit(char *er, char *ee)
+hit(const char *er, const char *ee)
 {
     register char *s = "";
 
@@ -496,7 +496,7 @@
  *	Print a message to indicate a poor swing
  */
 void
-miss(char *er, char *ee)
+miss(const char *er, const char *ee)
 {
     register char *s = "";