Do some more post-merge cleanup

Fixes a few more bugs

1 files changed, 3 insertions, 6 deletions

diff --git a/src/main.h b/src/main.h
index 89ab5edd..471e9830 100644
--- a/src/main.h
+++ b/src/main.h
@@ -107,15 +107,12 @@ enum State {
     STATE_UNREGISTER_ATTEMPT,
     STATE_UNREGISTER,
     STATE_SWITCH_SERVER,
-    STATE_SWITCH_SERVER_ATTEMPT, // 25
-    STATE_SWITCH_LOGIN,
-    STATE_SWITCH_LOGIN_ATTEMPT,
+    STATE_SWITCH_LOGIN, // 25
     STATE_SWITCH_CHARACTER,
-    STATE_SWITCH_CHARACTER_ATTEMPT,
-    STATE_LOGOUT_ATTEMPT, // 30
+    STATE_LOGOUT_ATTEMPT,
     STATE_WAIT,
     STATE_EXIT,
-    STATE_FORCE_QUIT
+    STATE_FORCE_QUIT // 30
 };
 
 /* length definitions for several char[]s in order