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

locations/Cheatmenu_din.qsrc

@@ -1563,7 +1563,7 @@ $cheatmenu['time'] = {
 	$SS
 	killvar 'SS'
 	*nl
-	'Weather: <a href="exec:sunWeather=iif(sunWeather=0,1,0) & $pogoda=iif(sunWeather=0,''Rain...'',''Clear...'') & chWeather = 1 & gs ''outdoors'', ''weather'' & dynamic $cheatmenu[''time'']">'+iif(sunWeather=0,'Rain','Sunny')+'</a>'
+	'Weather: <a href="exec:sunWeather=iif(sunWeather=0,1,0) & chWeather = 1 & gs ''outdoors'', ''weather'' & dynamic $cheatmenu[''time'']">'+iif(sunWeather=0,'Rain','Sunny')+'</a>'
 	*nl
 	'Temperature = <<$temperature>> - <a href="exec:temper += 1 & dynamic $cheatmenu[''time'']">+1 degree</a> - <a href="exec:temper += 5 & dynamic $cheatmenu[''time'']">+5 degrees</a> - <a href="exec:temper -= 1 & dynamic $cheatmenu[''time'']">-1 degree</a> - <a href="exec:temper -= 5 & dynamic $cheatmenu[''time'']">-5 degrees</a>'
 	*nl

locations/belpicknick.qsrc

@@ -416,15 +416,15 @@ if $ARGS[0] = 'vibor':
 end
 
 if $ARGS[0] = 'poisk':
-	gm = gmember
+	tempgm = gmember
 	:markpoisk_gmember
-	gm += 1
-	if gm > 4:gm = 1
-	if gm = 1 and sashaBeliTimes = 0:jump'markpoisk_gmember'
-	if gm = 2 and sipliGangTimes = 0:jump'markpoisk_gmember'
-	if gm = 3 and kolGangTimes = 0:jump'markpoisk_gmember'
-	if gm = 4 and tatarGangTimes = 0:jump'markpoisk_gmember'
-	if gm = 1 and sashaBeliTimes > 0 or gm = 2 and sipliGangTimes > 0 or gm = 3 and kolGangTimes > 0 or gm = 4 and tatarGangTimes > 0:gmember = gm
+	tempgm += 1
+	if tempgm > 4:tempgm = 1
+	if tempgm = 1 and sashaBeliTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 2 and sipliGangTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 3 and kolGangTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 4 and tatarGangTimes = 0:jump'markpoisk_gmember'
+	if tempgm = 1 and sashaBeliTimes > 0 or tempgm = 2 and sipliGangTimes > 0 or tempgm = 3 and kolGangTimes > 0 or tempgm = 4 and tatarGangTimes > 0:gmember = tempgm
 end
 
 

locations/shop_flamingos.qsrc

@@ -66,7 +66,7 @@ end
 if $ARGS[0] = 'flamingos_dress':
 	cla
 	menu_off = 1
-	if flamingos[i] ! 0:
+	if flamingos_dress[i] ! 0:
 		msg 'You already own this dress.'
 		gt 'shop_flamingos', 'dresses'
 	end
@@ -115,7 +115,7 @@ end
 if $ARGS[0] = 'flamingos_outfit':
 	cla
 	menu_off = 1
-	if flamingos[i] ! 0:
+	if flamingos_outfit[i] ! 0:
 		msg 'You already own this outfit.'
 		gt 'shop_flamingos', 'clothes'
 	end