Client: Options -> End Game

Instead of doing nothing functional, choosing Options -> End Game will now ask the user whether he or she wants to disconnect.
skyjake · Jul 14, 2011 · c4aa55c · c4aa55c
1 parent 4d8d034
commit c4aa55c
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 4 deletions.
diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -3573,7 +3573,7 @@ int M_QuitResponse(msgresponse_t response, void* context)
 
 void M_QuitDOOM(int option, void* context)
 {
-    const char*         endString;
+    const char* endString;
 
 #if __JDOOM__ || __JDOOM64__
     endString = endmsg[((int) GAMETIC % (NUM_QUITMESSAGES + 1))];
@@ -3589,7 +3589,14 @@ int M_EndGameResponse(msgresponse_t response, void* context)
 {
     if(response == MSG_YES)
     {
-        G_StartTitle();
+        if(IS_CLIENT)
+        {
+            DD_Execute(false, "net disconnect");
+        }
+        else
+        {
+            G_StartTitle();
+        }
         return true;
     }
 
@@ -3604,13 +3611,14 @@ void M_EndGame(int option, void* context)
         return;
     }
 
+    /*
     if(IS_NETGAME)
     {
         Hu_MsgStart(MSG_ANYKEY, NETEND, NULL, NULL);
         return;
-    }
+    }*/
 
-    Hu_MsgStart(MSG_YESNO, ENDGAME, M_EndGameResponse, NULL);
+    Hu_MsgStart(MSG_YESNO, IS_CLIENT? GET_TXT(TXT_DISCONNECT) : ENDGAME, M_EndGameResponse, NULL);
 }
 
 void M_ChangeMessages(int option, void* context)

diff --git a/doomsday/plugins/jdoom/defs/text.ded b/doomsday/plugins/jdoom/defs/text.ded
@@ -2017,3 +2017,8 @@ Text {
   ID = "PLAYERSETUP";
   Text = "Player Setup";
 }
+
+Text {
+  ID = "DISCONNECT";
+  Text = "Really disconnect?";
+}
diff --git a/doomsday/plugins/jdoom/include/info.h b/doomsday/plugins/jdoom/include/info.h
@@ -1680,6 +1680,7 @@ typedef enum {
     TXT_NOTDESIGNEDFOR,
     TXT_GAMESETUP,
     TXT_PLAYERSETUP,
+    TXT_DISCONNECT,
     NUMTEXT
 } textenum_t;
 

diff --git a/doomsday/plugins/jdoom64/defs/text.ded b/doomsday/plugins/jdoom64/defs/text.ded
@@ -1260,3 +1260,8 @@ Text {
   ID = "PLAYERSETUP";
   Text = "Player Setup";
 }
+
+Text {
+  ID = "DISCONNECT";
+  Text = "Really disconnect?";
+}
diff --git a/doomsday/plugins/jdoom64/include/info.h b/doomsday/plugins/jdoom64/include/info.h
@@ -1599,6 +1599,7 @@ typedef enum {
     TXT_NOTDESIGNEDFOR,
     TXT_GAMESETUP,
     TXT_PLAYERSETUP,
+    TXT_DISCONNECT,
     NUMTEXT
 } textenum_t;
 

diff --git a/doomsday/plugins/jheretic/defs/text.ded b/doomsday/plugins/jheretic/defs/text.ded
@@ -904,6 +904,11 @@ Text {
   Text = "Player Setup";
 }
 
+Text {
+  ID = "DISCONNECT";
+  Text = "Really disconnect?";
+}
+
 Text {
   ID = "HUSTR_E1M1";
   Text = "E1M1: The Docks";

diff --git a/doomsday/plugins/jheretic/include/info.h b/doomsday/plugins/jheretic/include/info.h
@@ -1710,6 +1710,7 @@ typedef enum {
     TXT_NOTDESIGNEDFOR,
     TXT_GAMESETUP,
     TXT_PLAYERSETUP,
+    TXT_DISCONNECT,
     TXT_HUSTR_E1M1,
     TXT_HUSTR_E1M2,
     TXT_HUSTR_E1M3,

diff --git a/doomsday/plugins/jhexen/defs/text.ded b/doomsday/plugins/jhexen/defs/text.ded
@@ -697,6 +697,11 @@ Text {
   Text = "Player Setup";
 }
 
+Text {
+  ID = "DISCONNECT";
+  Text = "Really disconnect?";
+}
+
 Text {
   ID = "RANDOMPLAYERCLASS";
   Text = "Random";

diff --git a/doomsday/plugins/jhexen/include/info.h b/doomsday/plugins/jhexen/include/info.h
@@ -3736,6 +3736,7 @@ typedef enum {
     TXT_NOTDESIGNEDFOR,
     TXT_GAMESETUP,
     TXT_PLAYERSETUP,
+    TXT_DISCONNECT,
     TXT_RANDOMPLAYERCLASS,
     TXT_PLAYERCLASS1,
     TXT_PLAYERCLASS2,