better check for 0 alpha (it now must be exactly 0.0f, not merely rounded off to...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 5c657a4eba62a0d81b9c63a36936fdc6cef8dc94..fbe9413d63990351765aaa1ea712094607715baa 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1436,6 +1436,38 @@ void M_Options_Key (int k)
 
 char *bindnames[][2] =
 {
+#ifdef BLOODBATH
+{"+forward",           "walk forward"},
+{"+back",                      "backpedal"},
+{"+moveleft",          "step left"},
+{"+moveright",                 "step right"},
+{"+jump",                      "jump / swim up"},
+{"+movedown",          "swim down"},
+{"+attack",            "attack"},
+{"+button3",           "altfire"},
+{"impulse 1",          "Pitch Fork"},
+{"impulse 2",          "Flare Gun"},
+{"impulse 3",          "Shotgun"},
+{"impulse 4",          "Machine Gun"},
+{"impulse 5",          "Incinerator"},
+{"impulse 6",          "Bombs"},
+{"impulse 7",          "Aerosol Can"},
+{"impulse 8",          "Tesla Cannon"},
+{"impulse 9",          "Life Leech"},
+{"impulse 17",         "Voodoo Doll"},
+{"impulse 11",         "previous weapon"},
+{"impulse 10",         "next weapon"},
+{"impulse 14",         "previous item"},
+{"impulse 15",         "next item"},
+{"impulse 13",         "use item"},
+{"impulse 100",                "add bot (red)"},
+{"impulse 101",                "add bot (blue)"},
+{"impulse 102",                "kick a bot"},
+{"impulse 50",         "voting menu"},
+{"impulse 141",                "identify player"},
+{"impulse 16",         "next armor type"},
+{"impulse 20",         "observer mode"}
+#else  // not BLOODBATH
 {"+attack",            "attack"},
 {"impulse 10",                 "next weapon"},
 {"impulse 12",                 "previous weapon"},
@@ -1455,6 +1487,7 @@ char *bindnames[][2] =
 {"+klook",                     "keyboard look"},
 {"+moveup",                    "swim up"},
 {"+movedown",          "swim down"}
+#endif  // not BLOODBATH
 };
 
 #define        NUMCOMMANDS     (sizeof(bindnames)/sizeof(bindnames[0]))
@@ -1644,13 +1677,13 @@ void M_Keys_Draw (void)
                                }
                        }
                }
-               M_Print (140, y, keystring);
+               M_Print (150, y, keystring);
        }
 
        if (bind_grab)
-               M_DrawCharacter (130, 48 + keys_cursor*8, '=');
+               M_DrawCharacter (140, 48 + keys_cursor*8, '=');
        else
-               M_DrawCharacter (130, 48 + keys_cursor*8, 12+((int)(realtime*4)&1));
+               M_DrawCharacter (140, 48 + keys_cursor*8, 12+((int)(realtime*4)&1));
 }
 
 
@@ -2306,41 +2339,49 @@ episode_t       nehahraepisodes[] =
 // Map list for BloodBath
 level_t                bloodbathlevels[] =
 {
-       {"bb1",         "The Stronghold"},
-       {"bb2",         "Winter Wonderland"},
-       {"bb3",         "Bodies"},
-       {"bb4",         "The Tower"},
-       {"bb5",         "Click!"},
-       {"bb7",         "Midgard"},
-       {"bb8",         "Fun With Heads"},
-
-       {"dm1",         "Monolith Building #11"},
-       {"dm2",         "Power!"},
-       {"dm3",         "Area 15"},
-
-       {"cpbb01",      "Crypt of Despair"},
-       {"cpbb03",      "Unholy Cathedral"},
-
-       {"b2a15",       "A15"},
-       {"barena",      "Blood Arena"},
-       {"bkeep",       "Blood Keep"},
-       {"bstar",       "Brownstar"},
-       {"crypt",       "The Crypt"},
-
-       {"bb3_2k1",     "Bodies Infusion"},
-       {"qbb1",        "The Confluence"},
-       {"qbb2",        "Kathartic"},
-       {"qbb3",        "Caleb's Woodland Retreat"},
-       {"qe1m7",       "The House of Chthon"}
+       {"bb1",                 "The Stronghold"},
+       {"bb2",                 "Winter Wonderland"},
+       {"bb3",                 "Bodies"},
+       {"bb4",                 "The Tower"},
+       {"bb5",                 "Click!"},
+       {"bb6",                 "Twin Fortress"},
+       {"bb7",                 "Midgard"},
+       {"bb8",                 "Fun With Heads"},
+       {"e1m1",                "Cradle to Grave"},
+       {"e1m7",                "Altar of Stone"},
+
+       {"dm1",                 "Monolith Building 11"},
+       {"dm2",                 "Power!"},
+       {"dm3",                 "Area 15"},
+       {"e6m8",                "Beauty and the Beast"},
+
+       {"cpbb01",              "Crypt of Despair"},
+       {"cpbb02",              "Pits of Blood"},
+       {"cpbb03",              "Unholy Cathedral"},
+       {"cpbb04",              "Deadly Inspirations"},
+
+       {"b2a15",               "Area 15 (B2)"},
+       {"barena",              "Blood Arena"},
+       {"bkeep",               "Blood Keep"},
+       {"bstar",               "Brown Star"},
+       {"crypt",               "The Crypt"},
+
+       {"bb3_2k1",             "Bodies Infusion"},
+       {"qbb1",                "The Confluence"},
+       {"qbb2",                "KathartiK"},
+       {"qbb3",                "Caleb's Woodland Retreat"},
+       {"ded_simp",    "Dead Simple"},
+       {"dranzbb6",    "Black Coffee"},
+       {"qe1m7",               "The House of Chthon"}
 };
 
 episode_t      bloodbathepisodes[] =
 {
-       {"Blood", 0, 7},
-       {"Plasma Pack", 7, 3},
-       {"Cryptic Passage", 10, 2},
-       {"Blood 2", 12, 5},
-       {"BloodBath", 17, 5}
+       {"Blood", 0, 10},
+       {"Plasma Pack", 10, 4},
+       {"Cryptic Passage", 14, 4},
+       {"Blood 2", 18, 5},
+       {"BloodBath", 23, 7}
 };
 
 gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};