projects
/
wordblah.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Completed the clues across and down functionality
[wordblah.git]
/
wordblox.c
diff --git
a/wordblox.c
b/wordblox.c
index
6ad88e1
..
ffbf471
100644
(file)
--- a/
wordblox.c
+++ b/
wordblox.c
@@
-8,7
+8,7
@@
#include "wordblox.h"
#include "constantstrings.h"
#include "wordblox.h"
#include "constantstrings.h"
-void set_clue_
across_word (Puzzle *p
)
+void set_clue_
word (Puzzle *p, enum ORIENTATION orient
)
{
print_puzzle (p);
if (p->grid_frozen == false)
{
print_puzzle (p);
if (p->grid_frozen == false)
@@
-25,7
+25,9
@@
void set_clue_across_word (Puzzle *p)
fgets (clue, MAX_CLUE_LENGTH, stdin);
char* cl = strtok (clue, "\n");
fgets (clue, MAX_CLUE_LENGTH, stdin);
char* cl = strtok (clue, "\n");
- bool res = set_across_clue (p, cl, index);
+ bool res;
+ res = set_clue (p, cl, index, orient);
+
if (res == false)
printf (NO_WORD_INDEX);
}
if (res == false)
printf (NO_WORD_INDEX);
}
@@
-147,13
+149,25
@@
void add_across_word (Puzzle *p)
print_puzzle (p);
char ch = getchar ();
}
print_puzzle (p);
char ch = getchar ();
}
+/* confirm exit */
+bool confirm_exit ()
+{
+ printf (INPUT_CONFIRM_EXIT);
+ char res[2];
+ fgets (res, 2, stdin);
+ if (toupper(res[0]) == 'Y')
+ return true;
+ else
+ return false;
+}
+/* main loop for the puzzle editor */
void puzzle_editor_loop (Puzzle *p, const char *filename)
{
bool loop = true;
while (loop)
{
void puzzle_editor_loop (Puzzle *p, const char *filename)
{
bool loop = true;
while (loop)
{
- print_menu (WHITE, RED, PUZZLE_MENU_TITLE, PUZZLE_EDIT_MENU,
9
, 50);
+ print_menu (WHITE, RED, PUZZLE_MENU_TITLE, PUZZLE_EDIT_MENU,
10
, 50);
printf (INPUT_CHOICE);
int ch = get_num ();
switch (ch)
printf (INPUT_CHOICE);
int ch = get_num ();
switch (ch)
@@
-175,15
+189,19
@@
void puzzle_editor_loop (Puzzle *p, const char *filename)
print_puzzle (p);
ch = getchar ();
break;
print_puzzle (p);
ch = getchar ();
break;
- case 7: set_clue_across_word (p);
+ case 7: set_clue_word (p, ACROSS);
+ print_puzzle (p);
+ ch = getchar ();
+ break;
+ case 8: set_clue_word (p, DOWN);
print_puzzle (p);
ch = getchar ();
break;
print_puzzle (p);
ch = getchar ();
break;
- case
8
: save_puzzle (p, filename);
+ case
9
: save_puzzle (p, filename);
printf ("%s\n",FILE_SAVED);
ch = getchar ();
break;
printf ("%s\n",FILE_SAVED);
ch = getchar ();
break;
- case
9: loop = false
;
+ case
10: loop = !confirm_exit ()
;
break;
}
}
break;
}
}