Fix some issues mentioned by divVerent and add Melanosuchus to credits

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 3d06854578acbda85607a119a59bea958e9c4d4d..b060b375f08df8f4aeaa7bd1349ab17b4d3ea434 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1145,8 +1145,7 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
        {
                if(!(MapInfo_Map_supportedGametypes & pGametypeToSet))
                {
-                       //error("Can't select the requested game type. This should never happen as the caller should prevent it!\n");
-                       return 0;
+                       error("Can't select the requested game type. This should never happen as the caller should prevent it!\n");
                        //_MapInfo_Map_ApplyGametypeEx("", pGametypeToSet, MAPINFO_TYPE_DEATHMATCH);
                        //return;
                }

diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc
index 7a016fd4b313c6653f0c1c2498a944ae72cdb58e..c5e32c4d8fdcd76fea7e13b42f39f145e678f1fa 100644 (file)
--- a/qcsrc/server/mapvoting.qc
+++ b/qcsrc/server/mapvoting.qc
@@ -5,8 +5,12 @@ float GameTypeVote_AvailabilityStatus(string gtname)
                return GTV_FORBIDDEN;
        
        if ( autocvar_nextmap != "" )
-       if ( !MapInfo_Get_ByName(autocvar_nextmap, FALSE, type) )
-               return GTV_FORBIDDEN;
+       {
+               if ( !MapInfo_Get_ByName(autocvar_nextmap, FALSE, 0) )
+                       return GTV_FORBIDDEN;
+               if (!(MapInfo_Map_supportedGametypes & type))
+                       return GTV_FORBIDDEN;
+       }
        
        return GTV_AVAILABLE;
 }

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 9fe937716a1d5d78f25ea2509a52fba7d0dd508f..2fcdf98ce1059a4166623531862fccd1de31b431 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -113,6 +113,7 @@ Oleh "BlaXpirit" Prypin
 Przemysław "atheros" Grzywacz
 Robert "ai" Kuroto
 The player with the unnecessarily long name
+Mattia "Melanosuchus" Basaglia
 
 
 **Translators