improved r_texturestats output (now gives a total for each pool) and merged some...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index f4f66b27d60ac53febe9179c9f15dbd7f1a31052..8b7559b84649f13de5d6e121731e81cb6342d585 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -682,12 +682,7 @@ void M_SinglePlayer_Key (int key, char ascii)
                        Cbuf_AddText ("maxplayers 1\n");
                        Cbuf_AddText ("deathmatch 0\n");
                        Cbuf_AddText ("coop 0\n");
-                       if (gamemode == GAME_NEHAHRA)
-                               Cbuf_AddText ("map nehstart\n");
-                       else if (gamemode == GAME_TRANSFUSION)
-                               Cbuf_AddText ("map e1m1\n");
-                       else
-                               Cbuf_AddText ("map start\n");
+                       Cbuf_AddText ("startmap_sp\n");
                        break;
 
                case 1:
@@ -3651,10 +3646,20 @@ void M_NetStart_Change (int dir)
                if (gamemode == GAME_GOODVSBAD2)
                        break;
                Cvar_SetValueQuick (&skill, skill.integer + dir);
-               if (skill.integer > 3)
-                       Cvar_SetValueQuick (&skill, 0);
-               if (skill.integer < 0)
-                       Cvar_SetValueQuick (&skill, 3);
+               if (gamemode == GAME_TRANSFUSION)
+               {
+                       if (skill.integer > 4)
+                               Cvar_SetValueQuick (&skill, 0);
+                       if (skill.integer < 0)
+                               Cvar_SetValueQuick (&skill, 4);
+               }
+               else
+               {
+                       if (skill.integer > 3)
+                               Cvar_SetValueQuick (&skill, 0);
+                       if (skill.integer < 0)
+                               Cvar_SetValueQuick (&skill, 3);
+               }
                break;
 
        case 5:
@@ -3892,7 +3897,8 @@ void M_ServerList_Key(int k, char ascii)
 
        case K_ENTER:
                S_LocalSound ("sound/misc/menu2.wav");
-               Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname));
+               if (hostcache_viewcount)
+                       Cbuf_AddText(va("connect \"%s\"\n", hostcache_viewset[slist_cursor]->info.cname));
                break;
 
        default: