-#define FLAG_MASTER 0x0001
-#define FLAG_ALIVE 0x0002
-#define FLAG_YOURTURN 0x0004
-#define FLAG_WONGAME 0x0008
+#define FLAG_MASTER 0x00000001
+#define FLAG_ALIVE 0x00000002
+#define FLAG_YOURTURN 0x00000004
+#define FLAG_WONGAME 0x00000008
+#define FLAG_DRAGONFIGHT 0x00000010
+#define FLAG_TIMEDOUT 0x00000020
+
+// Config File flags
+#define CFLAG_LISTENONCF 0x00000001
+#define CFLAG_USEPRIVMSG 0x00000002
+#define CFLAG_BOPER 0x00000004
+#define CFLAG_WELCOME 0x00000008
+#define CFLAG_SAVEDNOTICE 0x00000010
+#define CFLAG_USENICKSERV 0x00000020
+#define CFLAG_ROLLOVERFORESTFIGHTS 0x00000040
+#define CFLAG_FAIRFIGHTS 0x00000080
+
+#define setFairFights() (configflags |= CFLAG_FAIRFIGHTS)
+#define clearFairFights() (configflags &= ~CFLAG_FAIRFIGHTS)
+#define isFairFights() (configflags & CFLAG_FAIRFIGHTS)
+
+#define setRolloverForestFights() (configflags |= CFLAG_ROLLOVERFORESTFIGHTS)
+#define clearRolloverForestFights() (configflags &= ~CFLAG_ROLLOVERFORESTFIGHTS)
+#define isRolloverForestFights() (configflags & CFLAG_ROLLOVERFORESTFIGHTS)
+
+#define setUseNickServ() (configflags |= CFLAG_USENICKSERV)
+#define clearUseNickServ() (configflags &= ~CFLAG_USENICKSERV)
+#define isUseNickServ() (configflags & CFLAG_USENICKSERV)
+
+#define setSavedNotice() (configflags |= CFLAG_SAVEDNOTICE)
+#define clearSavedNotice() (configflags &= ~CFLAG_SAVEDNOTICE)
+#define isSavedNotice() (configflags & CFLAG_SAVEDNOTICE)