Use a macro to indicate the space character substitution.

It is somewhat safer to avoid non-ASCII characters in the source files
so avoid potential encoding issues on non-English platforms. And we may
as well use the # char as anything else. Macroified all usage of this
character and cleaned the errors reported by gcc for unchecked results.
Use fseek rather than reopening the wordlist file to start again.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/src/ag.c b/src/ag.c
index df1070df4d17da92d38f01b00bf4f161b43b2994..9d005b7d187aeec423ffab8b2a5330fd4c60288a 100644 (file)
--- a/src/ag.c
+++ b/src/ag.c
@@ -75,9 +75,9 @@
 #endif
 
 /* module level variables for game control */
-char shuffle[]  = "£££££££";
-char answer[]   = "£££££££";
-char language[10];
+char shuffle[8] = SPACE_FILLED_CHARS;
+char answer[8]  = SPACE_FILLED_CHARS;
+char language[64];
 char txt[50];
 char* rootWord;
 int updateAnswers = 0;
@@ -223,7 +223,7 @@ clearSoundBuffer()
 
 /***********************************************************
 synopsis: determine the next blank space in a string 
-         blanks are indicated by pound £ not space
+         blanks are indicated by pound not space
          
 inputs:   pointer the string to check
 
@@ -561,7 +561,7 @@ checkGuess(char* answer, struct node* head)
 
 /***********************************************************
 synopsis: determine the next blank space in a string 
-          blanks are indicated by pound £ not space.
+          blanks are indicated by pound not space.
          When a blank is found, move the chosen letter
          from one box to the other.
          i.e. If we're using the ANSWER box,
@@ -954,14 +954,11 @@ getRandomWord()
 
        for (i=0;i<=filelocation;i++){
 
-               if(fscanf(wordlist, "%s", wordFromList) != EOF){
+               if (fscanf(wordlist, "%s", wordFromList) != EOF) {
                        /* spin on */
-               }
-               else{
+               } else {
                        /* go back to the start of the file */
-                       fclose(wordlist);
-                       strcpy(txt,language);
-                       fopen(strcat(txt,"wordlist.txt"), "r");
+            fseek(wordlist, 0L, SEEK_SET);
                }
        }
 
@@ -976,12 +973,9 @@ getRandomWord()
 
                        if(fscanf(wordlist, "%s", wordFromList) != EOF){
                                /* spin on */
-                       }
-                       else{
+                       } else {
                                /* go back to the start of the file */
-                               fclose(wordlist);
-                               strcpy(txt,language);
-                               fopen(strcat(txt,"wordlist.txt"), "r");
+                               fseek(wordlist, 0L, SEEK_SET);
                                fscanf(wordlist, "%s", wordFromList);
                        }
                }
@@ -1018,30 +1012,6 @@ swapChars(int from, int to, char *string)
        return string;
 }
 
-/***********************************************************
-synopsis: working backwards in the string,
-         find the first non space character
-
-inputs: a string to check
-
-outputs: the position of the character
-***********************************************************/
-static int
-revFirstNonSpace(const char *thisWord)
-{
-    int i;
-
-       for (i = strlen(thisWord) ; i>0; i--){
-               if (thisWord[i-1] != SPACE_CHAR){
-                       return i;
-               }
-       }
-
-       return 0;
-}
-
-
-
 
 /***********************************************************
 synopsis: replace characters randomly
@@ -1228,7 +1198,7 @@ buildLetters(struct sprite** letters, SDL_Surface* screen)
                        thisLetter = NULL;
                }
                else{
-                       shuffle[i] = '£';
+                       shuffle[i] = SPACE_CHAR;
             /* rect.x = 26 * GAME_LETTER_WIDTH;*/
                }
 
@@ -1489,7 +1459,7 @@ newGame(struct node** head, struct dlb_node* dlbHead,
        }
 
        for (i = bigWordLen; i < 7; i++){
-               remain[i]='£';
+               remain[i] = SPACE_CHAR;
        }
 
        remain[7] = '\0';
@@ -1502,7 +1472,7 @@ newGame(struct node** head, struct dlb_node* dlbHead,
        free(guess);
        free(remain);
 
-       strcpy(answer, "£££££££");
+       strcpy(answer, SPACE_FILLED_STRING);
 
        /* build up the letter sprites */
        buildLetters(letters, screen);
@@ -1605,7 +1575,7 @@ gameLoop(struct node **head, struct dlb_node *dlbHead,
                        /* walk the list, setting everything to found */
                        solveIt(*head);
                        clearWord(letters);
-                       strcpy(shuffle, "£££££££");
+                       strcpy(shuffle, SPACE_FILLED_STRING);
                        strcpy(answer, rootWord);
                        /*displayLetters(screen);*/
                        displayAnswerBoxes(*head, screen);

diff --git a/src/ag.h b/src/ag.h
index 71ef861c045742dc7068fcbf483fdfa546b2fd56..3f7628c5c20465a8d82b7dd9c80a04dc3e6384b0 100644 (file)
--- a/src/ag.h
+++ b/src/ag.h
@@ -87,7 +87,9 @@ Contact Details: colm@coralquest.com
 #define SCORE_WIDTH 18
 #define SCORE_HEIGHT 32
 
-#define SPACE_CHAR '£'
+#define SPACE_CHAR '#'
 #define ASCII_SPACE 32
-
+#define SPACE_FILLED_STRING "#######"
+#define SPACE_FILLED_CHARS {SPACE_CHAR, SPACE_CHAR, SPACE_CHAR, SPACE_CHAR,\
+                             SPACE_CHAR, SPACE_CHAR, SPACE_CHAR, 0}
 #define AVAILABLE_TIME 300