diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index cebecf05..de10aeda 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -362,7 +362,7 @@ push __getar [ if (>= $n 0) [ n = (at [5:4 4:3 16:9 16:10] $n) ][ - n = (at ["" ~5:4 ~4:3 ~16:9 ~16:10] (+ (findlist [125 133 177 160] (div (* 100 $arg1) $arg2)) 1)) + n = (at (concat (concatword "~16:" (div (+ (div (* 160 $arg2) $arg1) 5) 10))) ~5:4 ~4:3) (+ (findlist [125 133] (div (* 100 $arg1) $arg2)) 1)) ] pop n ] diff --git a/config/opt/mapeditscripts.cfg b/config/opt/mapeditscripts.cfg index 26149c63..39ff4d71 100644 --- a/config/opt/mapeditscripts.cfg +++ b/config/opt/mapeditscripts.cfg @@ -48,7 +48,7 @@ tempalias doublemodels [ push iee (editentity $ii) if (&& (= (at $iee 2) (at $oee 2)) (&& (strcmp (mapmodelslotname (at $iee 5)) (mapmodelslotname (at $oee 5))) (= (at $iee 6) (at $oee 6)))) [ echo $ii : $iee --- $oi : $oee - addtodoentity $oi (concat double model $ii : $iee --- $oi : $oee) ] + addtodoentity $oi (concat double model $ii : $iee --- $oi : $oee) += res 1 ] pop iee diff --git a/packages/maps/dev_desert.cgz b/packages/maps/dev_desert.cgz index 4100e157..362a9c08 100644 Binary files a/packages/maps/dev_desert.cgz and b/packages/maps/dev_desert.cgz differ diff --git a/source/src/audiomanager.cpp b/source/src/audiomanager.cpp index 98a70def..f34d645a 100644 --- a/source/src/audiomanager.cpp +++ b/source/src/audiomanager.cpp @@ -779,7 +779,7 @@ COMMANDF(sound, "i", (int *n) }); COMMANDF(applymapsoundchanges, "", (){ - audiomgr.applymapsoundchanges(); + if(m_coop || !multiplayer("applymapsoundchanges")) audiomgr.applymapsoundchanges(); }); COMMANDF(unmuteallsounds, "", () {