X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=common.h;h=cde32fb391b9c8d90b43aa677c5455efedfa0949;hb=refs%2Ftags%2Fv4.3.14;hp=9d3fd41d7bc9443088b99883303f6b18b2e48ac7;hpb=062fb2bd92324706eed1fba8d5f7b4015ef2b058;p=xboard.git

diff --git a/common.h b/common.h
index 9d3fd41..cde32fb 100644
--- a/common.h
+++ b/common.h
@@ -86,6 +86,8 @@ int pclose(FILE *);
 #define FALSE 0
 #endif
 
+#define UNKNOWN -1 /* [HGM] nps */
+
 #if !HAVE_RANDOM
 # if HAVE_RAND48
 #  define srandom srand48
@@ -172,7 +174,7 @@ int pclose(FILE *);
 #define ZIPPY_GAME_START ""
 #define ZIPPY_ADJOURN FALSE
 #define ZIPPY_ABORT FALSE
-#define ZIPPY_VARIANTS "normal"
+#define ZIPPY_VARIANTS "normal,fischerandom,crazyhouse,losers,suicide,3checks,twokings,bughouse,shatranj"
 #define ZIPPY_MAX_GAMES 0
 #define ZIPPY_REPLAY_TIMEOUT 120
 
@@ -189,13 +191,13 @@ typedef enum {
     /* only the first N pieces can go into the holdings, and   */
     /* promotions in those variants shift P-W to U-S           */
     WhitePawn, WhiteKnight, WhiteBishop, WhiteRook, WhiteQueen, 
-    WhiteFerz, WhiteWazir, WhiteAlfil, WhiteMan, WhiteCannon, WhiteUnicorn,
-    WhiteNightrider, WhiteCardinal, WhiteMarshall, WhiteGrasshopper,
-    WhiteSilver, WhiteKing,
+    WhiteFerz, WhiteAlfil, WhiteAngel, WhiteMarshall, WhiteWazir, WhiteMan, 
+    WhiteCannon, WhiteNightrider, WhiteCardinal, WhiteDragon, WhiteGrasshopper,
+    WhiteSilver, WhiteFalcon, WhiteLance, WhiteCobra, WhiteUnicorn, WhiteKing,
     BlackPawn, BlackKnight, BlackBishop, BlackRook, BlackQueen,
-    BlackFerz, BlackWazir, BlackAlfil, BlackMan, BlackCannon, BlackUnicorn,
-    BlackNightrider, BlackCardinal, BlackMarshall, BlackGrasshopper,
-    BlackSilver, BlackKing,
+    BlackFerz, BlackAlfil, BlackAngel, BlackMarshall, BlackWazir, BlackMan, 
+    BlackCannon, BlackNightrider, BlackCardinal, BlackDragon, BlackGrasshopper,
+    BlackSilver, BlackFalcon, BlackLance, BlackCobra, BlackUnicorn, BlackKing,
     EmptySquare, 
     ClearBoard, WhitePlay, BlackPlay, PromotePiece, DemotePiece /*for use on EditPosition menus*/
   } ChessSquare;
@@ -203,8 +205,8 @@ typedef enum {
 /* [HGM] some macros that can be used as prefixes to convert piece types */
 #define WHITE_TO_BLACK (int)BlackPawn - (int)WhitePawn + (int)
 #define BLACK_TO_WHITE (int)WhitePawn - (int)BlackPawn + (int)
-#define PROMOTED       (int)WhiteUnicorn - (int)WhitePawn + (int)
-#define DEMOTED        (int)WhitePawn - (int)WhiteUnicorn + (int)
+#define PROMOTED       (int)WhiteDragon - (int)WhiteRook + (int)
+#define DEMOTED        (int)WhiteRook - (int)WhiteDragon + (int)
 #define SHOGI          (int)EmptySquare + (int)
 
 
@@ -242,6 +244,13 @@ typedef enum {
     SoundIcsDraw, SoundIcsUnfinished, NSoundClasses
 } SoundClass;
 
+typedef enum { 
+  SizeTiny, SizeTeeny, SizeDinky, SizePetite, SizeSlim, SizeSmall,
+  SizeMediocre, SizeMiddling, SizeAverage, SizeModerate, SizeMedium,
+  SizeBulky, SizeLarge, SizeBig, SizeHuge, SizeGiant, SizeColossal,
+  SizeTitanic, NUM_SIZES 
+} BoardSize;
+
 /* Names for chess variants, not necessarily supported */
 typedef enum {
     VariantNormal,       /* Normal chess */
@@ -274,7 +283,11 @@ typedef enum {
     VariantCapablanca,
     VariantKnightmate,
     VariantFairy,        
-    VariantShowgi,
+    VariantCylinder,
+    VariantFalcon,
+    VariantCapaRandom,
+    VariantBerolina,
+    VariantJanus,
     VariantUnknown       /* Catchall for other unknown variants */
 } VariantClass;
 
@@ -309,7 +322,10 @@ typedef enum {
   "capablanca", \
   "knightmate", \
   "fairy", \
-  "showgi", \
+  "cylinder", \
+  "falcon",\
+  "caparandom",\
+  "berolina",\
   "unknown" \
 }
 
@@ -543,6 +559,20 @@ typedef struct {
     int zippyMaxGames;
     int zippyReplayTimeout; /*seconds*/
 #endif
+
+    char *serverMovesName;
+    Boolean suppressLoadMoves;
+    int serverPause;
+    int firstTimeOdds;
+    int secondTimeOdds;
+    int timeOddsMode;
+    int firstAccumulateTC;
+    int secondAccumulateTC;
+    int firstNPS;
+    int secondNPS;
+    Boolean autoKibitz;
+    int engineComments;
+    char *userName;
 } AppData, *AppDataPtr;
 
 /* [AS] PGN tags (for showing in the game list) */