Browse Source

[fixed] A bug where if you left your car at one gas station and walked to the other, you would automatically be teleported back to the first one. This also made my last fix not needed anymore, and I have rolled it back because with the new change it might recreate the teleportation bug.

bgkjdgbizgblzdgbr 2 years ago
parent
commit
1ae7dfa1f9
3 changed files with 3 additions and 11 deletions
  1. 2 2
      locations/carF.qsrc
  2. 1 7
      locations/zaprF.qsrc
  3. 0 2
      locations/zaprFWash.qsrc

+ 2 - 2
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'

+ 1 - 7
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:

+ 0 - 2
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