diff --git a/config/opt/convmap.cfg b/config/opt/convmap.cfg index a19c0fbe..e4973d26 100644 --- a/config/opt/convmap.cfg +++ b/config/opt/convmap.cfg @@ -24,7 +24,7 @@ if $execnumargs [ looplist "convmaplist m t" i [ tempalias $i ] looplisti [ CMASTAGE CMAFIRSTERROR CMALASTERROR CMACOMMENT CMANUM ] n [ tempalias $n $i ] -tempalias cmstagenames [ NOP MAPCONFIG TRANSCLIP CLEANSLOTS FIXUNASSIGNEDS FIXBADENTS MANUALERRORS MANUALEDITING FIXPICKUPFHF ] +tempalias cmstagenames [ NOP MAPCONFIG TRANSCLIP CLEANSLOTS FIXUNASSIGNEDS FIXBADENTS MANUALERRORS MANUALEDITING FIXPICKUPFHF FINDSTRAYENTS ] if (checkalias uncliptagclippedmodels) [ cmstagenames = (concat $cmstagenames REDUCECLIPS) ] tempalias NUMSTAGES (listlen $cmstagenames) looplisti $cmstagenames n [ tempalias $n $i ] @@ -441,6 +441,20 @@ if (! (checkalias cmcur)) [ // execute this only once ] ] + const cm_dostage_FINDSTRAYENTS [ // find entities sitting in 8x8 solid cubes + looplist [playerstart pistol ammobox grenades health helmet armour akimbo ladder ctf-flag light mapmodel ] ent [ + looplist (enumentities $ent) i [ + push t 0 + select (- (at (editentity $i) 1) 4) (- (at (editentity $i) 2) 4) 8 8 + selectionwalk [ += t $sw_type ] + if (&& (! (pop t)) (strlen (selx))) [ + addtodoentity $i "entity placed in solid cubes" + abort = 1 + ] + ] + ] + ] + const cmfixmapmodelpaths [ push cnt 0 push ispre12 0 diff --git a/packages/maps/dev_depot.cgz b/packages/maps/dev_depot.cgz index ec48d520..8e60489c 100644 Binary files a/packages/maps/dev_depot.cgz and b/packages/maps/dev_depot.cgz differ diff --git a/packages/maps/dev_venison.cgz b/packages/maps/dev_venison.cgz index 7a0b442d..5b073424 100644 Binary files a/packages/maps/dev_venison.cgz and b/packages/maps/dev_venison.cgz differ