Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/portnoi2.qsrc

@@ -59,14 +59,14 @@ i = 1
 :yofficemet
 	if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('office'):jump 'yofficemet'
+if i <= ARRSIZE('gm_office'):jump 'yofficemet'
 
 i = 1
 :yschoolmet
 	if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 	if i = 6: i = 7
-if i <= ARRSIZE('school'):jump 'yschoolmet'
+if i <= ARRSIZE('gm_school'):jump 'yschoolmet'
 
 i = 1
 :yfetishmet
@@ -84,7 +84,7 @@ i = 1
 :yuniformmet
 	if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('uniform'):jump 'yuniformmet'
+if i <= ARRSIZE('gm_uniform'):jump 'yuniformmet'
 
 i = 1
 :yswimwearmet
@@ -201,14 +201,14 @@ elseif money >= poshvalldrop:
 	:xofficemet
 		if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):gm_office_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('office'):jump 'xofficemet'
+	if i <= ARRSIZE('gm_office'):jump 'xofficemet'
 
 	i = 1
 	:xschoolmet
 		if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):gm_school_b[i] = pcs_hips
 		i += 1
 		if i = 6: i = 7
-	if i <= ARRSIZE('school'):jump 'xschoolmet'
+	if i <= ARRSIZE('gm_school'):jump 'xschoolmet'
 
 	i = 1
 	:xfetishmet
@@ -226,7 +226,7 @@ elseif money >= poshvalldrop:
 	:xuniformmet
 		if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):gm_uniform_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('uniform'):jump 'xuniformmet'
+	if i <= ARRSIZE('gm_uniform'):jump 'xuniformmet'
 
 	i = 1
 	:xswimwearmet