Merge branch 'master' into master-grammar-fixes

locations/clothing.qsrc

@@ -439,7 +439,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopfancy_burlesque
-				if fancy_burlesque[i] = 1 and burlesque_s[i] = cloc and ($clothingworntype ! 'fancy_burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fancy_burlesque', i)
+				if fancy_burlesque[i] = 1 and fancy_burlesque_s[i] = cloc and ($clothingworntype ! 'fancy_burlesque' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'fancy_burlesque', i)
 				i += 1
 			if i <= ARRSIZE('fancy_burlesque'):jump 'loopfancy_burlesque'
 

locations/clothing_QV.qsrc

@@ -430,14 +430,14 @@ if $ARGS[0] = 'list':
 
 		i = 1
 		:loopburlesque
-		if burlesque[i] = 1:
+		if fancy_burlesque[i] = 1:
 			gs 'clothing_attributes', 'burlesque', i
 			if CloInhibit <= pcs_inhib:
-				if burlesque_s[i] = 0 and burlesque_h[i] > 0 and burlesque_b[i] >= (pcs_hips - 8) and burlesque_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''burlesque'', <<i>>"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
+				if fancy_burlesque_s[i] = 0 and fancy_burlesque_h[i] > 0 and fancy_burlesque_b[i] >= (pcs_hips - 8) and fancy_burlesque_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''burlesque'', <<i>>"><img src="images/pc/items/fancy/burlesque/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('burlesque'):jump 'loopburlesque'
+		if i <= ARRSIZE('fancy_burlesque'):jump 'loopburlesque'
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end