Merge branch 'develop' into macos-develop

diff --cc src/Makefile.am
Simple merge

diff --cc src/floor/floor-save.cpp
Simple merge

diff --cc src/main-win.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/main/angband-initializer.cpp
Simple merge

diff --cc src/main/angband-initializer.h
index 3f7d9e6,bb62fe6..a22e284
--- 1/src/main/angband-initializer.h
--- 2/src/main/angband-initializer.h
+++ b/src/main/angband-initializer.h
@@@ -10,13 -11,6 +11,9 @@@
   * are included in all such copies.
   */
  
- #ifndef INCLUDED_INIT_H
- #define INCLUDED_INIT_H
- 
- #include "system/angband.h"
++#include "system/h-basic.h"
 +
+ typedef struct player_type player_type;
  void init_angband(player_type *player_ptr, bool no_term);
 -void init_file_paths(char *path, char *varpath);
 +void init_file_paths(concptr libpath, concptr varpath);
 +void create_needed_dirs(void);
- 
- #endif /* INCLUDED_INIT_H */

diff --cc src/store/purchase-order.cpp
Simple merge

diff --cc src/store/sell-order.cpp
Simple merge