X-Git-Url: https://harishankar.org/repos/?p=wordblah.git;a=blobdiff_plain;f=wordblox.h;h=2978e0da3df0858f1c3c73b0fd51cbc31cb3abf8;hp=8886fabaa9b388f0543834698dabfb1d4d3270bb;hb=70d116c047f04b31939c11a3856be04e1edcd783;hpb=d27505add68f9df169f2135a416bdf52ce9af8c3

diff --git a/wordblox.h b/wordblox.h
index 8886fab..2978e0d 100644
--- a/wordblox.h
+++ b/wordblox.h
@@ -58,6 +58,17 @@ typedef struct {
 	char salt[256];
 } Puzzle;
 
+/* The player data struct type - for the player app */
+typedef struct {
+	Puzzle puzzle;
+	char filename[65535];
+	bool is_loaded;
+	char char_ans[MAX_PUZZLE_SIZE][MAX_PUZZLE_SIZE];
+	int cur_row;
+	int cur_col;
+} MainPlayerData;
+
+
 /* get a number from the user */
 int get_num ()
 {
@@ -267,7 +278,7 @@ void unfreeze_puzzle (Puzzle *p)
 /* freeze the grid - make editing impossible because it finalizes the
    across and down words in the grid */
 void freeze_puzzle (Puzzle *p)
-{
+{		
 	int word_num = 1;
 	bool across_word_start, down_word_start;
 	for (int i = 0; i < p->grid_size; i ++)
@@ -277,7 +288,7 @@ void freeze_puzzle (Puzzle *p)
 			across_word_start = false; 
 			down_word_start = false;
 			/* if it is a blank cell - cover it with a block */
-			if (p->chars[i][j] == ' ')
+			if (p->chars[i][j] == ' ' || p->chars[i][j] == '#')
 				p->chars[i][j] = '#';
 			/* it is not a blank cell - check all possibilities */
 			else 
@@ -692,6 +703,7 @@ void print_menu (enum COLOR fg, enum COLOR bg, const char* title,
 			printf ("\u2550");
 		printf ("\u2557"); 
 		reset_color (); printf ("\n");
+		set_color (fg, bg, NORMAL);
 		printf ("\u2551");
 		set_color (fg, bg, BOLD);
 		printf ("%-*s", padding, title);
@@ -719,4 +731,86 @@ void print_menu (enum COLOR fg, enum COLOR bg, const char* title,
 		reset_color (); printf ("\n");
 }
 
+/* reset the player data, from the new file */
+void reset_player_data (MainPlayerData *app_data, const char *filename)
+{
+	app_data->puzzle = load_puzzle (filename);
+
+	app_data->is_loaded = app_data->puzzle.grid_frozen;
+	app_data->cur_col = -1;
+	app_data->cur_row = -1;
+	strcpy (app_data->filename, filename);
+	/* reset the answer keys */
+	for (int i = 0; i < app_data->puzzle.grid_size; i ++)
+		for (int j = 0; j < app_data->puzzle.grid_size; j ++)
+			app_data->char_ans[i][j] = ' ';
+	
+}
+
+/* in the player app, move the current selection index left or right */
+void move_current_col (MainPlayerData *app_data, enum DIRECTION dir)
+{
+	int r = app_data->cur_row;
+	int c = app_data->cur_col;
+	if (dir == DIR_FORWARD)
+	{
+		c ++;
+		while (c < app_data->puzzle.grid_size)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				c ++;
+			else
+				break;
+		}
+		if (c < app_data->puzzle.grid_size)
+			app_data->cur_col = c;
+	}
+	else 
+	{
+		c --;
+		while (c >= 0)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				c --;
+			else
+				break;
+		}
+		if (c >= 0)
+			app_data->cur_col = c;
+	}
+}
+
+/* in the player app move the current selection index up or down */
+void move_current_row (MainPlayerData *app_data, enum DIRECTION dir)
+{
+	int r = app_data->cur_row;
+	int c = app_data->cur_col;
+	if (dir == DIR_FORWARD)
+	{
+		r ++;
+		while (r < app_data->puzzle.grid_size)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				r ++;
+			else
+				break;
+		}
+		if (r < app_data->puzzle.grid_size)
+			app_data->cur_row = r;
+	}
+	else 
+	{
+		r --;
+		while (r >= 0)
+		{
+			if (app_data->puzzle.chars[r][c] == '#')
+				r --;
+			else
+				break;
+		}
+		if (r >= 0)
+			app_data->cur_row = r;
+	}
+}
+
 #endif