A few minor changes for BloodBath support (including the map list); more to come

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1668 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/common.c b/common.c
index 3285ddff92c46cebaa3198ff245028f3bfa5ccfc..6eb69277d1b671126b422b1f7e4bf63f7ba9b776 100644 (file)
--- a/common.c
+++ b/common.c
@@ -1835,6 +1835,9 @@ void COM_InitFilesystem (void)
        case GAME_ZYMOTIC:
                COM_AddGameDirectory (va("%s/zymotic", basedir) );
                break;
+       case GAME_BLOODBATH:
+               COM_AddGameDirectory (va("%s/bb", basedir) );
+               break;
        default:
                Sys_Error("COM_InitFilesystem: unknown gamemode %i\n", gamemode);
                break;

diff --git a/host.c b/host.c
index c9f500f3079fb45690df20dd6a2419b536563cb1..1a20443e9c996ce9814f5aeb203e24db7a5c1335 100644 (file)
--- a/host.c
+++ b/host.c
@@ -200,6 +200,11 @@ void       Host_FindMaxClients (void)
                else
                        svs.maxclients = 8;
        }
+
+       // BloodBath doesn't support single player games
+       if (gamemode == GAME_BLOODBATH && svs.maxclients < 4)
+               svs.maxclients = 4;
+
        if (svs.maxclients < 1)
                svs.maxclients = 8;
        else if (svs.maxclients > MAX_SCOREBOARD)

diff --git a/menu.c b/menu.c
index 3d7e46dfc63d1cdffbbcacb85d71be4601107a30..7e1a7a12d2f3d0805d7ed2d513511b5a19f9eda7 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2335,17 +2335,44 @@ episode_t       nehahraepisodes[] =
        {"Dimension of the Lost", 17, 2}
 };
 
-// these are placeholders for bloodbath developers to fill in more correctly
+// Map list for BloodBath
 level_t                bloodbathlevels[] =
 {
-       {"start",       "Welcome to BloodBath"},
-       {"bb1m1",       "Level 1"}
+       {"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"}
 };
 
 episode_t      bloodbathepisodes[] =
 {
-       {"Welcome to BloodBath", 0, 1},
-       {"BloodBath Episode 1", 1, 1}
+       {"Blood", 0, 7},
+       {"Plasma Pack", 7, 3},
+       {"Cryptic Passage", 10, 2},
+       {"Blood 2", 12, 5},
+       {"BloodBath", 17, 5}
 };
 
 gamelevels_t sharewarequakegame = {"Shareware Quake", quakelevels, quakeepisodes, 2};
@@ -2353,7 +2380,7 @@ gamelevels_t registeredquakegame = {"Quake", quakelevels, quakeepisodes, 7};
 gamelevels_t hipnoticgame = {"Scourge of Armagon", hipnoticlevels, hipnoticepisodes, 6};
 gamelevels_t roguegame = {"Dissolution of Eternity", roguelevels, rogueepisodes, 4};
 gamelevels_t nehahragame = {"Nehahra", nehahralevels, nehahraepisodes, 4};
-gamelevels_t bloodbathgame = {"BloodBath", bloodbathlevels, bloodbathepisodes, 2};
+gamelevels_t bloodbathgame = {"BloodBath", bloodbathlevels, bloodbathepisodes, 5};
 
 typedef struct
 {