X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=c40cd925895c6bf42541188e68da96a62aec5c10;hb=7e0222e64da6706bf0dc2468f459b98e4346206b;hp=e42b9c6e5099e0a3560bcd28b384e2d26dca88fc;hpb=07a96d271c45508c7b628f77a88b6a4032bb0fd8;p=xboard.git

diff --git a/book.c b/book.c
index e42b9c6..c40cd92 100644
--- a/book.c
+++ b/book.c
@@ -35,8 +35,18 @@
 #include <math.h>
 
 #include "common.h"
+#include "frontend.h"
 #include "backend.h"
 #include "moves.h"
+#include "gettext.h"
+
+#ifdef ENABLE_NLS
+# define  _(s) gettext (s)
+# define N_(s) gettext_noop (s)
+#else
+# define  _(s) (s)
+# define N_(s)  s
+#endif
 
 #ifdef _MSC_VER
   typedef unsigned __int64 uint64;
@@ -44,7 +54,6 @@
   typedef unsigned long long int uint64;
 #endif
 
-
 #ifdef _MSC_VER
 #  define U64(u) (u##ui64)
 #else
@@ -274,10 +283,28 @@ uint64 *RandomEnPassant =Random64+772;
 uint64 *RandomTurn      =Random64+780;
 
 
-uint64 hash(int moveNr)
+uint64
+hash (int moveNr)
 {
     int r, f, p_enc, squareNr, pieceGroup;
     uint64 key=0, holdingsKey=0, Zobrist;
+    VariantClass v = gameInfo.variant;
+
+    switch(v) {
+	case VariantNormal:
+	case VariantFischeRandom: // compatible with normal
+	case VariantNoCastle:
+	case VariantXiangqi: // for historic reasons; does never collide anyway because of other King type
+	    break;
+	case VariantGiveaway: // in opening same as suicide
+	    key += VariantSuicide;
+	    break;
+	case VariantGothic: // these are special cases of CRC, and can share book
+	case VariantCapablanca:
+	    v = VariantCapaRandom;
+	default:
+	    key += v; // variant type incorporated in key to allow mixed books without collisions
+    }
 
     for(f=0; f<BOARD_WIDTH; f++){
         for(r=0; r<BOARD_HEIGHT;r++){
@@ -353,7 +380,8 @@ uint64 hash(int moveNr)
 
 #define MOVE_BUF 100
 
-int int_from_file(FILE *f, int l, uint64 *r)
+int
+int_from_file (FILE *f, int l, uint64 *r)
 {
     int i,c;
     for(i=0;i<l;i++){
@@ -366,7 +394,8 @@ int int_from_file(FILE *f, int l, uint64 *r)
     return 0;
 }
 
-int entry_from_file(FILE *f, entry_t *entry)
+int
+entry_from_file (FILE *f, entry_t *entry)
 {
     int ret;
     uint64 r;
@@ -388,10 +417,11 @@ int entry_from_file(FILE *f, entry_t *entry)
     return 0;
 }
 
-int find_key(FILE *f, uint64 key, entry_t *entry)
+int
+find_key (FILE *f, uint64 key, entry_t *entry)
 {
     int first, last, middle;
-    entry_t first_entry=entry_none, last_entry,middle_entry;
+    entry_t last_entry,middle_entry;
     first=-1;
     if(fseek(f,-16,SEEK_END)){
         *entry=entry_none;
@@ -413,12 +443,12 @@ int find_key(FILE *f, uint64 key, entry_t *entry)
             last_entry=middle_entry;
         }else{
             first=middle;
-            first_entry=middle_entry;
         }
     }
 }
 
-void move_to_string(char move_s[6], uint16 move)
+void
+move_to_string (char move_s[6], uint16 move)
 {
     int f,fr,ff,t,tr,tf,p;
     int width = BOARD_RGHT - BOARD_LEFT, size; // allow for alternative board formats
@@ -466,7 +496,8 @@ void move_to_string(char move_s[6], uint16 move)
     }
 }
 
-int GetBookMoves(int moveNr, char *book, entry_t entries[])
+int
+GetBookMoves (int moveNr, char *book, entry_t entries[])
 {   // retrieve all entries for given position from book in 'entries', return number.
     static FILE *f = NULL;
     static char curBook[MSG_SIZ];
@@ -484,7 +515,7 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
 	f = fopen(book,"rb");
     }
     if(!f){
-	DisplayError("Polyglot book not valid", 0);
+        DisplayError(_("Polyglot book not valid"), 0);
 	appData.usePolyglotBook = FALSE;
 	return -1;
     }
@@ -513,8 +544,9 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
     return count;
 }
 
-char *ProbeBook(int moveNr, char *book)
-{   // 
+char *
+ProbeBook (int moveNr, char *book)
+{
     entry_t entries[MOVE_BUF];
     int count;
     int i, j;
@@ -544,7 +576,7 @@ char *ProbeBook(int moveNr, char *book)
         total_weight += entries[i].weight;
 	if(total_weight > j) break;
     }
-    if(i >= count) DisplayFatalError("Book Fault", 0, 1); // safety catch, cannot happen
+    if(i >= count) DisplayFatalError(_("Book Fault"), 0, 1); // safety catch, cannot happen
     move_to_string(move_s, entries[i].move);
     if(appData.debugMode) fprintf(debugFP, "book move field = %d\n", entries[i].move);
 
@@ -554,7 +586,8 @@ char *ProbeBook(int moveNr, char *book)
 extern char yy_textstr[];
 entry_t lastEntries[MOVE_BUF];
 
-char *MovesToText(int count, entry_t *entries)
+char *
+MovesToText (int count, entry_t *entries)
 {
 	int i, totalWeight = 0;
 	char algMove[6];
@@ -574,7 +607,8 @@ char *MovesToText(int count, entry_t *entries)
 	return p;
 }
 
-int TextToMoves(char *text, int moveNum, entry_t *entries)
+int
+TextToMoves (char *text, int moveNum, entry_t *entries)
 {
 	int i, w, count=0;
       uint64 hashKey = hash(moveNum);
@@ -613,7 +647,8 @@ int TextToMoves(char *text, int moveNum, entry_t *entries)
 Boolean bookUp;
 int currentCount;
 
-Boolean DisplayBook(int moveNr)
+Boolean
+DisplayBook (int moveNr)
 {
     entry_t entries[MOVE_BUF];
     int count;
@@ -627,19 +662,22 @@ Boolean DisplayBook(int moveNr)
     return TRUE;
 }
 
-void EditBookEvent()
+void
+EditBookEvent ()
 {
       bookUp = TRUE;
 	bookUp = DisplayBook(currentMove);
 }
 
-void int_to_file(FILE *f, int l, uint64 r)
+void
+int_to_file (FILE *f, int l, uint64 r)
 {
     int i;
     for(i=l-1;i>=0;i--) fputc(r>>8*i & 255, f);
 }
 
-void entry_to_file(FILE *f, entry_t *entry)
+void
+entry_to_file (FILE *f, entry_t *entry)
 {
     int_to_file(f,8,entry->key);
     int_to_file(f,2,entry->move);
@@ -650,7 +688,8 @@ void entry_to_file(FILE *f, entry_t *entry)
 
 char buf1[4096], buf2[4096];
 
-void SaveToBook(char *text)
+void
+SaveToBook (char *text)
 {
     entry_t entries[MOVE_BUF], entry;
     int count = TextToMoves(text, currentMove, entries);
@@ -658,10 +697,10 @@ void SaveToBook(char *text)
     FILE *f;
     if(!count && !currentCount) return;
     f=fopen(appData.polyglotBook, "rb+");
-    if(!f){	DisplayError("Polyglot book not valid", 0); return; }
+    if(!f){	DisplayError(_("Polyglot book not valid"), 0); return; }
     offset=find_key(f, entries[0].key, &entry);
     if(entries[0].key != entry.key && currentCount) {
-	  DisplayError("Hash keys are different", 0);
+          DisplayError(_("Hash keys are different"), 0);
 	  fclose(f);
 	  return;
     }
@@ -676,8 +715,10 @@ void SaveToBook(char *text)
     if(count != currentCount) {
 	do {
 	    for(i=0; i<len1; i++) buf2[i] = buf1[i]; len2 = len1;
-	    fseek(f, readpos, SEEK_SET);
-	    readpos += len1 = fread(buf1, 1, 4096, f);
+	    if(readpos > writepos) {
+		fseek(f, readpos, SEEK_SET);
+		readpos += len1 = fread(buf1, 1, 4096, f);
+	    } else len1 = 0; // wrote already past old EOF
 	    fseek(f, writepos, SEEK_SET);
 	    fwrite(buf2, 1, len2, f);
 	    writepos += len2;