Merge branch 'keni-staticfn' into NetHack-3.7

src/music.c

@@ -28,19 +28,19 @@
 
 #include "hack.h"
 
-static void awaken_scare(struct monst *, boolean);
-static void awaken_monsters(int);
-static void put_monsters_to_sleep(int);
-static void charm_snakes(int);
-static void calm_nymphs(int);
-static void charm_monsters(int);
-static void do_earthquake(int);
-static const char *generic_lvl_desc(void);
-static int do_improvisation(struct obj *);
-static char *improvised_notes(boolean *);
+staticfn void awaken_scare(struct monst *, boolean);
+staticfn void awaken_monsters(int);
+staticfn void put_monsters_to_sleep(int);
+staticfn void charm_snakes(int);
+staticfn void calm_nymphs(int);
+staticfn void charm_monsters(int);
+staticfn void do_earthquake(int);
+staticfn const char *generic_lvl_desc(void);
+staticfn int do_improvisation(struct obj *);
+staticfn char *improvised_notes(boolean *);
 
 /* wake up monster, possibly scare it */
-static void
+staticfn void
 awaken_scare(struct monst *mtmp, boolean scary)
 {
     mtmp->msleeping = 0;
@@ -62,7 +62,7 @@ awaken_scare(struct monst *mtmp, boolean scary)
  * Wake every monster in range...
  */
 
-static void
+staticfn void
 awaken_monsters(int distance)
 {
     struct monst *mtmp;
@@ -80,7 +80,7 @@ awaken_monsters(int distance)
  * Make monsters fall asleep.  Note that they may resist the spell.
  */
 
-static void
+staticfn void
 put_monsters_to_sleep(int distance)
 {
     struct monst *mtmp;
@@ -100,7 +100,7 @@ put_monsters_to_sleep(int distance)
  * Charm snakes in range.  Note that the snakes are NOT tamed.
  */
 
-static void
+staticfn void
 charm_snakes(int distance)
 {
     struct monst *mtmp;
@@ -134,7 +134,7 @@ charm_snakes(int distance)
  * Calm nymphs in range.
  */
 
-static void
+staticfn void
 calm_nymphs(int distance)
 {
     struct monst *mtmp;
@@ -191,7 +191,7 @@ awaken_soldiers(struct monst* bugler  /* monster that played instrument */)
 }
 
 /* Charm monsters in range.  Note that they may resist the spell. */
-static void
+staticfn void
 charm_monsters(int distance)
 {
     struct monst *mtmp, *mtmp2;
@@ -218,7 +218,7 @@ charm_monsters(int distance)
 /* Generate earthquake :-) of desired force.
  * That is:  create random chasms (pits).
  */
-static void
+staticfn void
 do_earthquake(int force)
 {
     static const char into_a_chasm[] = " into a chasm";
@@ -455,7 +455,7 @@ do_earthquake(int force)
         }
 }
 
-static const char *
+staticfn const char *
 generic_lvl_desc(void)
 {
     if (Is_astralevel(&u.uz))
@@ -480,7 +480,7 @@ static const char *beats[] = {
 /*
  * The player is trying to extract something from his/her instrument.
  */
-static int
+staticfn int
 do_improvisation(struct obj *instr)
 {
     int damage, mode, do_spec = !(Stunned || Confusion);
@@ -709,7 +709,7 @@ do_improvisation(struct obj *instr)
     return 2; /* That takes time */
 }
 
-static char *
+staticfn char *
 improvised_notes(boolean *same_as_last_time)
 {
     static const char notes[7] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G' };