Mercurial > hg > early-roguelike

diff arogue5/fight.c @ 233:0990adf580ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Declare some function arguments as const. Some functions, mostly in fight.c, declared variables as pointers to const char but passed them to functions that took pointers to ordinary char. The strings did not actually get modified, so adding 'const' to the function definitions removed the warnings.
author John "Elwin" Edwards
date Sun, 06 Mar 2016 19:32:47 -0500
parents 56e748983fa8
children
line wrap: on
line diff
--- a/arogue5/fight.c	Sun Mar 06 14:45:18 2016 -0500
+++ b/arogue5/fight.c	Sun Mar 06 19:32:47 2016 -0500
@@ -20,17 +20,18 @@
 
 bool roll_em(struct thing *att_er, struct thing *def_er, struct object *weap, 
              bool hurl, struct object *cur_weapon, bool back_stab);
-void hit(struct object *weapon, struct thing *tp, char *er, char *ee, 
-         bool back_stab);
-void miss(struct object *weapon, struct thing *tp, char *er, char *ee);
+void hit(struct object *weapon, struct thing *tp, const char *er,
+         const char *ee, bool back_stab);
+void miss(struct object *weapon, struct thing *tp, const char *er, 
+          const char *ee);
 int dext_plus(int dexterity);
 int str_plus(short str);
 int add_dam(short str);
 int hung_dam(void);
-void thunk(struct object *weap, struct thing *tp, char *mname);
-void m_thunk(struct object *weap, struct thing *tp, char *mname);
-void bounce(struct object *weap, struct thing *tp, char *mname);
-void m_bounce(struct object *weap, struct thing *tp, char *mname);
+void thunk(struct object *weap, struct thing *tp, const char *mname);
+void m_thunk(struct object *weap, struct thing *tp, const char *mname);
+void bounce(struct object *weap, struct thing *tp, const char *mname);
+void m_bounce(struct object *weap, struct thing *tp, const char *mname);
 struct object *wield_weap(struct object *thrown, struct thing *mp);
 void explode(struct thing *tp);
 
@@ -1037,7 +1038,7 @@
  */
 
 char *
-prname(char *who, bool upper)
+prname(const char *who, bool upper)
 {
     static char tbuf[LINELEN];
 
@@ -1062,7 +1063,8 @@
  */
 
 void
-hit(struct object *weapon, struct thing *tp, char *er, char *ee, bool back_stab)
+hit(struct object *weapon, struct thing *tp, const char *er, const char *ee, 
+    bool back_stab)
 {
     register char *s = NULL;
     char 
@@ -1119,7 +1121,7 @@
  */
 
 void
-miss(struct object *weapon, struct thing *tp, char *er, char *ee)
+miss(struct object *weapon, struct thing *tp, const char *er, const char *ee)
 {
     register char *s = NULL;
     char
@@ -1226,7 +1228,7 @@
  */
 
 void
-thunk(struct object *weap, struct thing *tp, char *mname)
+thunk(struct object *weap, struct thing *tp, const char *mname)
 {
     /* tp: Defender */
     char *def_name;	/* Name of defender */
@@ -1254,7 +1256,7 @@
  */
 
 void
-m_thunk(struct object *weap, struct thing *tp, char *mname)
+m_thunk(struct object *weap, struct thing *tp, const char *mname)
 {
     char *att_name;	/* Name of attacker */
 
@@ -1281,7 +1283,7 @@
  */
 
 void
-bounce(struct object *weap, struct thing *tp, char *mname)
+bounce(struct object *weap, struct thing *tp, const char *mname)
 {
     /* tp: Defender */
     char *def_name;	/* Name of defender */
@@ -1309,7 +1311,7 @@
  */
 
 void
-m_bounce(struct object *weap, struct thing *tp, char *mname)
+m_bounce(struct object *weap, struct thing *tp, const char *mname)
 {
     char *att_name;	/* Name of attacker */