Merge branch 'main' of https://bdgit.educoder.net/ptfnxz784/NetHack into cyq_branch

src/NetHack_3.7/src/detect.c

@@ -9,7 +9,7 @@
  */
 
 #include "hack.h"
-#include "artifact.h"
+#include "artifact.h" 
 
 static boolean unconstrain_map(void); 
 static void reconstrain_map(void);

src/NetHack_3.7/src/dig.c

@@ -3,7 +3,7 @@
 /*-Copyright (c) Michael Allison, 2012. */
 /* NetHack may be freely redistributed.  See license for details. */
 
-#include "hack.h"
+#include "hack.h" 
 
 static boolean rm_waslit(void);
 static void mkcavepos(coordxy, coordxy, int, boolean, boolean);

src/NetHack_3.7/src/display.c

@@ -19,7 +19,7 @@
  * interface.
  *
  * The display system deals with an abstraction called a glyph.  Anything
- * that could possibly be displayed has a unique glyph identifier. 
+ * that could possibly be displayed has a unique glyph identifier.  
  *
  * What is seen on the screen is a combination of what the hero remembers
  * and what the hero currently sees.  Objects and dungeon features (walls

src/NetHack_3.7/src/dlb.c

@@ -26,7 +26,7 @@ typedef struct dlb_procs {
     int (*dlb_fread_proc)(char *, int, int, DLB_P);
     int (*dlb_fseek_proc)(DLB_P, long, int);
     char *(*dlb_fgets_proc)(char *, int, DLB_P);
-    int (*dlb_fgetc_proc)(DLB_P); 
+    int (*dlb_fgetc_proc)(DLB_P);  
     long (*dlb_ftell_proc)(DLB_P);
 } dlb_procs_t;
 

src/NetHack_3.7/src/do.c

@@ -26,7 +26,7 @@ static void temperature_change_msg(schar);
 
 /* the #drop command: drop one inventory item */
 int
-dodrop(void) 
+dodrop(void)  
 {
     int result;
 

src/NetHack_3.7/src/do_name.c

@@ -28,7 +28,7 @@ static void do_oname(struct obj *);
 static char *docall_xname(struct obj *);
 static void namefloorobj(void);
 
-extern const char what_is_an_unknown_object[]; /* from pager.c */ 
+extern const char what_is_an_unknown_object[]; /* from pager.c */  
 
 #define NUMMBUF 5
 

src/NetHack_3.7/src/do_wear.c

@@ -32,7 +32,7 @@ static int Shirt_on(void);
 static void dragon_armor_handling(struct obj *, boolean, boolean);
 static void Amulet_on(void);
 static void learnring(struct obj *, boolean);
-static void adjust_attrib(struct obj *, int, int); 
+static void adjust_attrib(struct obj *, int, int);  
 static void Ring_off_or_gone(struct obj *, boolean);
 static int select_off(struct obj *);
 static struct obj *do_takeoff(void);

src/NetHack_3.7/src/dog.c

@@ -34,7 +34,7 @@ free_edog(struct monst *mtmp)
 {
     if (mtmp->mextra && EDOG(mtmp)) {
         free((genericptr_t) EDOG(mtmp));
-        EDOG(mtmp) = (struct edog *) 0; 
+        EDOG(mtmp) = (struct edog *) 0;  
     }
     mtmp->mtame = 0;
 }

src/NetHack_3.7/src/dogmove.c

@@ -33,7 +33,7 @@ droppables(struct monst *mon)
      * be considered a duplicate and get treated as a normal candidate
      * for dropping.
      *
-     * This could be 'auto', but then 'gcc -O2' warns that this function 
+     * This could be 'auto', but then 'gcc -O2' warns that this function  
      * might return the address of a local variable.  It's mistaken,
      * &dummy is never returned.  'static' is simplest way to shut it up.
      */

src/NetHack_3.7/src/dokick.c

@@ -31,7 +31,7 @@ static const char kick_passes_thru[] = "kick passes harmlessly through";
 static void
 kickdmg(struct monst *mon, boolean clumsy)
 {
-    int mdx, mdy; 
+    int mdx, mdy;  
     int dmg = (ACURRSTR + ACURR(A_DEX) + ACURR(A_CON)) / 15;
     int specialdmg, kick_skill = P_NONE;
     boolean trapkilled = FALSE;

src/NetHack_3.7/src/dothrow.c

@@ -30,7 +30,7 @@ static boolean mhurtle_step(genericptr_t, coordxy, coordxy);
       && ((o)->otyp == AKLYS                                            \
           || ((o)->oartifact == ART_MJOLLNIR && Role_if(PM_VALKYRIE)))) \
      || (o)->otyp == BOOMERANG)
- 
+  
 /* gt.thrownobj (decl.c) tracks an object until it lands */
 
 int