fixed hl sprite types to properly handle the palette in each mode

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 3fcc7dbd10ac9b657ad9e366d9d36682aa6fde2e..d42e4cca432af84dea23fe1ff00300bcc33b0d11 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1105,19 +1105,19 @@ void M_Transfusion_Skill_Key (int key, char ascii)
                switch (m_skill_cursor)
                {
                case 0:
-                       Cbuf_AddText ("skill 0\n");
+                       Cbuf_AddText ("skill 1\n");
                        break;
                case 1:
-                       Cbuf_AddText ("skill 1\n");
+                       Cbuf_AddText ("skill 2\n");
                        break;
                case 2:
-                       Cbuf_AddText ("skill 2\n");
+                       Cbuf_AddText ("skill 3\n");
                        break;
                case 3:
-                       Cbuf_AddText ("skill 3\n");
+                       Cbuf_AddText ("skill 4\n");
                        break;
                case 4:
-                       Cbuf_AddText ("skill 4\n");
+                       Cbuf_AddText ("skill 5\n");
                        break;
                }
                key_dest = key_game;
@@ -3562,6 +3562,8 @@ level_t           transfusionlevels[] =
        {"cpbb04",              "Deadly Inspirations"},
 
        {"b2a15",               "Area 15 (B2)"},
+       {"b2bodies",    "BB_Bodies (B2)"},
+       {"b2cabana",    "BB_Cabana"},
        {"b2power",             "BB_Power"},
        {"barena",              "Blood Arena"},
        {"bkeep",               "Blood Keep"},
@@ -3582,6 +3584,9 @@ level_t           transfusionlevels[] =
        {"fragm",               "Frag'M"},
        {"maim",                "Maim"},
        {"qe1m7",               "The House of Chthon"},
+       {"qdm1",                "Dm-Place of Two Deaths"},
+       {"qdm4",                "Dm-The Bad Place"},
+       {"qdm5",                "Dm-The Cistern"},
        {"qmorbias",    "Dm-Morbias"},
        {"simple",              "Dead Simple"}
 };
@@ -3596,9 +3601,9 @@ episode_t transfusionepisodes[] =
        {"Post Mortem", 45, 9},
        {"Cryptic Passage", 54, 10},
        {"Cryptic BloodBath", 64, 4},
-       {"Blood 2", 68, 6},
-       {"Transfusion", 74, 9},
-       {"Conversions", 83, 6}
+       {"Blood 2", 68, 8},
+       {"Transfusion", 76, 9},
+       {"Conversions", 85, 9}
 };
 
 level_t goodvsbad2levels[] =
@@ -3804,17 +3809,31 @@ void M_GameOptions_Draw (void)
                        }
                        M_Print(160, 72, msg);
                }
-
                M_Print(0, 80, "            Skill");
-               if (skill.integer == 0)
-                       M_Print(160, 80, "Easy difficulty");
-               else if (skill.integer == 1)
-                       M_Print(160, 80, "Normal difficulty");
-               else if (skill.integer == 2)
-                       M_Print(160, 80, "Hard difficulty");
+               if (gamemode == GAME_TRANSFUSION)
+               {
+                       if (skill.integer == 1)
+                               M_Print(160, 80, "Still Kicking");
+                       else if (skill.integer == 2)
+                               M_Print(160, 80, "Pink On The Inside");
+                       else if (skill.integer == 3)
+                               M_Print(160, 80, "Lightly Broiled");
+                       else if (skill.integer == 4)
+                               M_Print(160, 80, "Well Done");
+                       else
+                               M_Print(160, 80, "Extra Crispy");
+               }
                else
-                       M_Print(160, 80, "Nightmare difficulty");
-
+               {
+                       if (skill.integer == 0)
+                               M_Print(160, 80, "Easy difficulty");
+                       else if (skill.integer == 1)
+                               M_Print(160, 80, "Normal difficulty");
+                       else if (skill.integer == 2)
+                               M_Print(160, 80, "Hard difficulty");
+                       else
+                               M_Print(160, 80, "Nightmare difficulty");
+               }
                M_Print(0, 88, "       Frag Limit");
                if (fraglimit.integer == 0)
                        M_Print(160, 88, "none");
@@ -3962,10 +3981,10 @@ void M_NetStart_Change (int dir)
                Cvar_SetValueQuick (&skill, skill.integer + dir);
                if (gamemode == GAME_TRANSFUSION)
                {
-                       if (skill.integer > 4)
-                               Cvar_SetValueQuick (&skill, 0);
-                       if (skill.integer < 0)
-                               Cvar_SetValueQuick (&skill, 4);
+                       if (skill.integer > 5)
+                               Cvar_SetValueQuick (&skill, 1);
+                       if (skill.integer < 1)
+                               Cvar_SetValueQuick (&skill, 5);
                }
                else
                {