Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/carF.qsrc

@@ -6,7 +6,7 @@ $enddrive = {
 	if cardrive = 3:gt 'city_industrial'
 	if cardrive = 4:gt 'city_lake', 'start'
 	if cardrive = 5:gt 'city_park', 'start'
-	if cardrive = 6:gt 'zaprF', 'start'
+	if cardrive = 6: litltown = 0 & gt 'zaprF', 'start'
 	if cardrive = 7:gt 'autoservisF', 'start'
 	if cardrive = 9:gt 'autotraidF', 'start'
 	if cardrive = 10:gt 'city_park', 'whore'
@@ -17,7 +17,7 @@ $enddrive = {
 	if cardrive = 18:gt 'youplace'
 	if cardrive = 19:gt 'city_industrial_train', 'outside'
 	if cardrive = 20:gt 'pav_residential'
-	if cardrive = 21:gt 'zaprF','start'
+	if cardrive = 21: litltown = 1 & gt 'zaprF','start'
 	if cardrive = 22:gt 'road'
 	if cardrive = 23:gt 'gadukino'
 	if cardrive = 24:gt 'pav_commercial'

locations/fame.qsrc

@@ -439,7 +439,7 @@ if $ARGS[0] = 'calculate':
 	end	
 	
 
-	!! Fame in the city will take alittle while before it start being noticed in other places. But the it will start spreading much faster than in the city. (The formula is +1050-52500000/(50000+(fame_city/10)^3 if the palyer si Sveta, but will spread a little slower for non Sveta starts using the formula +fame_city^2/1000)
+	!! Fame in the city will take alittle while before it start being noticed in other places. But the it will start spreading much faster than in the city. (The formula is +1050-52500000/(50000+(fame_city/10)^3 if the palyer is Sveta, but will spread a little slower for non Sveta starts using the formula +fame_city^2/1000)
 	if StoryLine = 1:
 		if dyneval('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 2000: 
 			dynamic 'fame[''city_<<$ARGS[1]>>_contribution_high''] = 1050'

locations/zaprF.qsrc

@@ -23,13 +23,7 @@ if $ARGS[0] = 'start':
 	*nl
 
 	act 'Leave':
-		if cardrive = 6:
-			minut += 5
-			gt 'city_industrial'
-		elseif cardrive = 21:
-			minut += 5
-			gt 'pav_commercial'
-		elseif litltown = 0:
+		if litltown = 0:
 			minut += 5
 			gt 'city_industrial'
 		elseif litltown = 1:

locations/zaprFWash.qsrc

@@ -11,8 +11,6 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	*clr & cla
 	! can''t wash cars if have visible cum already
-	if cardrive = 6: litltown = 0
-	if cardrive = 21: litltown = 1
 	if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
 		minut += 5
 		pcs_mood -= 5