Merge remote-tracking branch 'upstream/master'

locations/city_musicstore.qsrc

@@ -99,20 +99,19 @@ if $ARGS[0] = 'cameback':
 		end
 	end
 	act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
-		act 'Try some guitars': 
+	act 'Try some guitars': 
 !!			TODO: Better scenes here			
-			if pcs_instrmusic < 30 and pcs_performing < 10:
-				'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
-			else
-				'Some texts here depending on music skill and performing skill'			
-			end
+		if pcs_instrmusic < 30 and pcs_performing < 10:
+			'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
+		else
+			'Some texts here depending on music skill and performing skill'			
 		end
-		act 'Leave': 
-			if ml_boughtguitar > 0 or ml_boughtamp > 0:
-				gt 'city_musicstore', 'payandtakestuff'
-			end
-			gt 'torgcentr'
+	end
+	act 'Leave': 
+		if ml_boughtguitar > 0 or ml_boughtamp > 0:
+			gt 'city_musicstore', 'payandtakestuff'
 		end
+		gt 'torgcentr'
 	end
 end
 

locations/city_residential.qsrc

@@ -99,7 +99,7 @@ else
 	st_count=0 & $show_table=''
 	if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment','3'
 	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
-	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment','3'
+	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''city_dima'', ''start''">Dimas</a> apartment','3'
 	if klofQW >= 2:gs'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment','3'
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
 		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovnas</a> apartment.'

locations/music_buskingevents.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'calculate_tips':
 		ml_location_mod = 30
 	elseif $ARGS[1] = 'pav':
 		ml_location_mod = 0
-	elseif $ARGS[1] = 'oldtown'
+	elseif $ARGS[1] = 'oldtown':
 		ml_location_mod = 15
 	end