Fix typos and minor changes

13 files changed, 27 insertions, 138 deletions

diff --git a/Makefile b/Makefile
index 8828829..833c377 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 VERSION	= 3
-PATCHLEVEL = ~rc1
+PATCHLEVEL = ~rc2
 SUBLEVEL = 
 EXTRAVERSION =
 NAME = instalable
@@ -21,7 +21,7 @@ export	SUBLEVEL
 # To see a list of typical targets execute "make help"
 # More info can be located in ./README.txt
 # Comments in this file are targeted only to the developer, do not
-# expect to learn how to build mine_sweeper reading this file.
+# expect to learn how to build mine-sweeper reading this file.
 
 ################################################################################
 # Beautify output
@@ -203,6 +203,10 @@ install: uninstall
 	
 	@echo  "Create $(INSTALL_VAR_DIR)/$(VAR_DIR)/"
 	$(Q)mkdir -p		$(DESTDIR)/$(INSTALL_VAR_DIR)/$(VAR_DIR)/
+	$(Q)mkdir		$(DESTDIR)/$(INSTALL_VAR_DIR)/$(VAR_DIR)/boards_beginner/
+	$(Q)mkdir		$(DESTDIR)/$(INSTALL_VAR_DIR)/$(VAR_DIR)/boards_intermediate/
+	$(Q)mkdir		$(DESTDIR)/$(INSTALL_VAR_DIR)/$(VAR_DIR)/boards_expert/
+	$(Q)mkdir		$(DESTDIR)/$(INSTALL_VAR_DIR)/$(VAR_DIR)/boards_custom/
 	@echo "Copy var/*"
 	$(Q)cp -r		./var/*			$(DESTDIR)/$(INSTALL_VAR_DIR)/$(VAR_DIR)/
 	@echo "Change owner"
diff --git a/README.txt b/README.txt
index 14a5051..edd8a2b 100644
--- a/README.txt
+++ b/README.txt
@@ -66,6 +66,11 @@ UNINSTALL:
 		run 'UNINSTALL.cmd' as administrator
 
 
+The program creates a folder '.mine-sweeper/' at $HOME (also in Windows).  It
+is used by the program to store saved games.  If you remove the game, you
+should delete that folder manually.
+
+
 THE PROGRAM DOES:
 	The typical minesweeper game.
 
diff --git a/SETUP.cmd b/SETUP.cmd
index 333cfe3..ccd386b 100644
--- a/SETUP.cmd
+++ b/SETUP.cmd
@@ -2,12 +2,15 @@
 :: *DOCUMENTATION*
 :: This SETUP.bat installs mine-sweeper in MS Windows
 
-@echo	off
+::##############################################################################
+:: Uninstall previous installations
+
+call	"%~dp0\UNINSTALL.cmd"
 
 ::##############################################################################
 :: Install
 
-call	"%~dp0\UNINSTALL.cmd"
+@echo	off
 
 mkdir	"%ProgramFiles(x86)%\mine-sweeper\"
 echo	"Create %ProgramFiles(x86)%/mine-sweeper/"
diff --git a/UNINSTALL.cmd b/UNINSTALL.cmd
index df3a5e4..71181e1 100644
--- a/UNINSTALL.cmd
+++ b/UNINSTALL.cmd
@@ -1,6 +1,6 @@
 ::##############################################################################
 :: *DOCUMENTATION*
-:: This UNINSTALL.bat uninstalls mine_sweeper off MS Windows
+:: This UNINSTALL.bat uninstalls mine-sweeper off MS Windows
 
 @echo	off
 
diff --git a/modules/about/inc/about.h b/modules/about/inc/about.h
index b40ae2f..b51eee9 100644
--- a/modules/about/inc/about.h
+++ b/modules/about/inc/about.h
@@ -20,7 +20,7 @@
 /******************************************************************************

  ******* macros ***************************************************************

  ******************************************************************************/

-	# define	PROG_NAME	"mine_sweeper"

+	# define	PROG_NAME	"mine-sweeper"

 	# define	PROG_YEAR	"2015"

 

 

diff --git a/modules/save/src/save.c b/modules/save/src/save.c
index 729520c..f2c60e3 100644
--- a/modules/save/src/save.c
+++ b/modules/save/src/save.c
@@ -119,7 +119,7 @@ void	load_game_file	(char *filepath, char *filename)
 

 	fp	= fopen(file_name, "r");

 	if (fp) {

-		fscanf(fp, "mine_sweeper saved game");

+		fscanf(fp, "mine-sweeper saved game");

 		fscanf(fp, " rows %i", &game_board.rows);

 		fscanf(fp, " cols %i", &game_board.cols);

 		fscanf(fp, " mines %i", &game_board.mines);

@@ -196,7 +196,7 @@ void	save_game_file	(char *filepath)
 	/* Write to a new file */

 	fp	= fopen(file_name, "w");

 	if (fp) {

-		fprintf(fp, "mine_sweeper saved game\n");

+		fprintf(fp, "mine-sweeper saved game\n");

 		fprintf(fp, "rows %i\n", game_board.rows);

 		fprintf(fp, "cols %i\n", game_board.cols);

 		fprintf(fp, "mines %i\n", game_board.mines);

diff --git a/share/HELP.txt b/share/HELP.txt
index d5a66fb..3f66acb 100644
--- a/share/HELP.txt
+++ b/share/HELP.txt
@@ -38,4 +38,4 @@ for any corresponding short options.
 
 
 Report bugs to: 1903716@gmail.com
-mine_sweeper home page: <https://github.com/AlejandroColomar/mine_sweeper/>
+mine-sweeper home page: <https://github.com/AlejandroColomar/mine-sweeper/>
diff --git a/share/README.txt b/share/README.txt
index 14a5051..edd8a2b 100644
--- a/share/README.txt
+++ b/share/README.txt
@@ -66,6 +66,11 @@ UNINSTALL:
 		run 'UNINSTALL.cmd' as administrator
 
 
+The program creates a folder '.mine-sweeper/' at $HOME (also in Windows).  It
+is used by the program to store saved games.  If you remove the game, you
+should delete that folder manually.
+
+
 THE PROGRAM DOES:
 	The typical minesweeper game.
 
diff --git a/share/saved/saved_000.mine b/share/saved/saved_000.mine
index deef2fe..536ccf9 100644
--- a/share/saved/saved_000.mine
+++ b/share/saved/saved_000.mine
@@ -1,4 +1,4 @@
-mine_sweeper saved game
+mine-sweeper saved game
 rows	8
 cols	8
 mines	9
diff --git a/var/hiscores/boards_beginner/zxc.mine b/var/hiscores/boards_beginner/zxc.mine
deleted file mode 100644
index 189f897..0000000
--- a/var/hiscores/boards_beginner/zxc.mine
+++ /dev/null
@@ -1,24 +0,0 @@
-mine_sweeper saved game
-rows 8
-cols 8
-mines 10
-gnd
-0,0,0,0,0,2,11,2
-0,1,1,1,0,3,12,3
-1,2,10,1,0,2,11,2
-10,3,2,2,0,1,2,2
-1,2,11,2,1,0,1,10
-0,1,2,11,1,1,2,2
-0,0,2,2,2,1,10,1
-0,0,1,10,1,1,1,1
-usr
-1,1,1,1,1,1,2,1
-1,1,1,1,1,1,2,1
-1,1,2,1,1,1,2,1
-2,1,1,1,1,1,1,1
-1,1,2,1,1,1,1,2
-1,1,1,2,1,1,1,1
-1,1,1,1,1,1,2,1
-1,1,1,2,1,1,1,1
-flags 10
-cleared 54
diff --git a/var/hiscores/boards_custom/zxc.mine b/var/hiscores/boards_custom/zxc.mine
deleted file mode 100644
index 45a8118..0000000
--- a/var/hiscores/boards_custom/zxc.mine
+++ /dev/null
@@ -1,24 +0,0 @@
-mine_sweeper saved game
-rows 8
-cols 8
-mines 3
-gnd
-0,0,0,0,0,0,0,0
-0,0,0,0,0,0,0,0
-0,0,0,1,1,1,0,0
-0,0,0,1,10,1,0,0
-0,1,1,2,1,1,0,0
-0,1,10,1,0,0,0,0
-0,1,1,1,0,1,1,1
-0,0,0,0,0,1,10,1
-usr
-1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,1
-1,1,1,1,0,1,1,1
-1,1,1,1,1,1,1,1
-1,1,0,1,1,1,1,1
-1,1,1,1,1,1,1,1
-1,1,1,1,1,1,0,1
-flags 0
-cleared 61
diff --git a/var/hiscores/boards_expert/zxc.mine b/var/hiscores/boards_expert/zxc.mine
deleted file mode 100644
index ab834ed..0000000
--- a/var/hiscores/boards_expert/zxc.mine
+++ /dev/null
@@ -1,40 +0,0 @@
-mine_sweeper saved game
-rows 16
-cols 30
-mines 99
-gnd
-0,1,1,2,10,1,0,1,1,2,1,1,1,1,1,0,0,1,1,1,0,1,1,2,10,1,1,10,1,0
-1,3,12,3,1,1,0,1,10,2,10,1,1,10,1,0,0,2,11,2,0,1,10,2,2,2,2,1,1,0
-1,12,12,2,0,0,0,1,1,2,1,1,1,1,2,1,1,2,11,2,0,1,1,2,2,11,1,1,2,2
-1,2,2,1,0,0,1,1,1,1,2,2,1,0,1,11,2,2,1,1,1,2,2,2,11,2,1,1,11,11
-0,0,0,1,1,2,2,11,2,2,12,11,1,0,1,2,11,2,1,2,2,13,12,3,1,1,1,2,3,2
-1,1,0,1,10,2,11,2,2,12,4,3,1,0,1,2,3,3,12,3,13,5,13,2,0,1,2,11,1,0
-10,1,0,1,1,2,1,1,1,2,12,2,1,0,2,11,3,11,3,12,3,12,3,2,1,2,12,4,2,1
-1,1,0,0,0,1,2,2,1,2,4,13,2,0,2,12,5,3,4,2,3,2,3,12,3,4,13,4,11,1
-1,2,3,2,1,1,11,11,1,2,13,13,3,1,2,2,13,12,3,11,2,2,11,3,13,13,4,12,2,1
-2,13,13,12,1,2,3,3,1,2,13,4,3,10,1,2,4,13,4,3,12,2,1,2,4,13,4,2,2,1
-11,5,14,4,1,1,10,1,1,2,4,12,3,1,1,1,11,3,3,13,3,3,1,2,3,12,2,1,10,1
-1,3,11,2,0,2,2,2,1,10,4,12,3,0,0,1,1,2,11,3,11,2,10,2,11,2,1,1,2,2
-1,3,3,2,1,2,11,1,1,2,5,13,3,1,1,1,0,1,1,3,2,3,1,2,1,1,0,0,1,10
-1,11,11,1,1,11,3,2,1,2,13,13,2,1,10,2,1,2,1,2,11,2,1,0,0,0,0,0,1,1
-2,3,3,1,2,2,3,10,1,3,13,5,2,3,2,3,10,2,11,3,3,11,1,1,1,1,0,1,1,1
-1,10,1,0,1,10,2,1,1,2,11,3,10,2,10,2,1,2,2,11,2,1,1,1,10,1,0,1,10,1
-usr
-1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,2,1,1
-1,1,2,1,1,1,1,1,2,1,2,1,1,2,1,1,1,1,2,1,1,1,2,1,1,1,1,1,1,1
-1,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,2,1,1,1,1
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,2,1,1,1,2,2
-1,1,1,1,1,1,1,2,1,1,2,2,1,1,1,1,2,1,1,1,1,2,2,1,1,1,1,1,1,1
-1,1,1,1,2,1,2,1,1,2,1,1,1,1,1,1,1,1,2,1,2,1,2,1,1,1,1,2,1,1
-2,1,1,1,1,1,1,1,1,1,2,1,1,1,1,2,1,2,1,2,1,2,1,1,1,1,2,1,1,1
-1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,2,1,1,1,1,1,1,1,2,1,1,2,1,2,1
-1,1,1,1,1,1,2,2,1,1,2,2,1,1,1,1,2,2,1,2,1,1,2,1,2,2,1,2,1,1
-1,2,2,2,1,1,1,1,1,1,2,1,1,2,1,1,1,2,1,1,2,1,1,1,1,2,1,1,1,1
-2,1,2,1,1,1,2,1,1,1,1,2,1,1,1,1,2,1,1,2,1,1,1,1,1,2,1,1,2,1
-1,1,2,1,1,1,1,1,1,2,1,2,1,1,1,1,1,1,2,1,2,1,2,1,2,1,1,1,1,1
-1,1,1,1,1,1,2,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2
-1,2,2,1,1,2,1,1,1,1,2,2,1,1,2,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,1,2,1,1,2,1,1,1,1,1,2,1,2,1,1,2,1,1,1,1,1,1,1,1
-1,2,1,1,1,2,1,1,1,1,2,1,2,1,2,1,1,1,1,2,1,1,1,1,2,1,1,1,2,1
-flags 99
-cleared 381
diff --git a/var/hiscores/boards_intermediate/zxc.mine b/var/hiscores/boards_intermediate/zxc.mine
deleted file mode 100644
index 3cbbba1..0000000
--- a/var/hiscores/boards_intermediate/zxc.mine
+++ /dev/null
@@ -1,40 +0,0 @@
-mine_sweeper saved game
-rows 16
-cols 16
-mines 40
-gnd
-0,1,1,1,0,0,1,1,2,10,1,1,10,1,0,0
-0,1,10,1,0,1,2,12,3,2,2,2,2,2,1,1
-0,1,1,2,1,2,11,3,11,1,2,11,3,2,11,1
-0,1,1,2,10,2,1,2,1,1,2,11,3,11,2,1
-1,2,10,2,1,1,1,1,1,0,1,1,2,1,1,0
-10,3,2,3,1,1,1,11,2,1,0,0,0,0,0,0
-1,2,11,3,11,1,1,2,11,1,0,0,0,0,1,1
-0,1,3,13,3,1,0,1,1,1,1,1,1,1,3,12
-0,0,2,11,2,0,0,0,1,1,2,10,1,1,12,12
-0,0,1,1,2,1,2,1,2,10,3,2,2,1,3,3
-0,1,1,1,1,11,3,11,2,1,2,10,1,0,1,10
-1,2,11,1,1,3,13,3,1,0,1,2,2,1,1,1
-1,11,2,1,0,2,11,3,2,2,1,2,11,2,0,0
-1,1,1,0,1,2,2,2,11,11,2,3,12,2,0,0
-0,0,0,0,2,11,2,2,3,3,2,11,2,1,0,0
-0,0,0,0,2,11,2,1,10,1,1,1,1,0,0,0
-usr
-1,1,1,1,1,1,1,1,1,2,1,1,2,1,1,1
-1,1,2,1,1,1,1,2,1,1,1,1,1,1,1,1
-1,1,1,1,1,1,2,1,2,1,1,2,1,1,2,1
-1,1,1,1,2,1,1,1,1,1,1,2,1,2,1,1
-1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1
-2,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1
-1,1,2,1,2,1,1,1,2,1,1,1,1,1,1,1
-1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,2
-1,1,1,2,1,1,1,1,1,1,1,2,1,1,2,2
-1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1
-1,1,1,1,1,2,1,2,1,1,1,2,1,1,1,2
-1,1,2,1,1,1,2,1,1,1,1,1,1,1,1,1
-1,2,1,1,1,1,2,1,1,1,1,1,2,1,1,1
-1,1,1,1,1,1,1,1,2,2,1,1,2,1,1,1
-1,1,1,1,1,2,1,1,1,1,1,2,1,1,1,1
-1,1,1,1,1,2,1,1,2,1,1,1,1,1,1,1
-flags 40
-cleared 216