Merge branch 'master' of ADCSux/glife into master

[fixed] Rental of city apartment couldn't be cancelled unless you had other rental and ownership and cancelling Pushkin apartment was setting home variable where it shouldn't

locations/agentned.qsrc

@@ -48,22 +48,24 @@ if $ARGS[0] = 'start':
 	
 	act 'View rentals': gt 'agentned', 'rent'
 	act 'View properties for sale': gt 'agentned', 'buy'
-	if (home_owned[1] = 1 or home_owned[1] = 2) and home_owned[4] = 1: 
-		if home_owned[1] = 1:
-			act 'Cancel the lease of the city apartment':
+
+	if home_owned[1] = 1:
+		act 'Cancel the lease of the city apartment':
 				cla & *nl
 				'Attention: You won''t be able to return to your apartment when you cancel the lease.'
 				
 				act 'Return': gt'agentned', 'start'
-				act 'Cancel it': home_owned[1] = 0 & gs 'set_home', 4 & gt'agentned', 'start'
-			end
+				act 'Cancel it': home_owned[1] = 0 & gt'agentned', 'start'
 		end
+	end
+
+	if home_owned[4] = 1:
 		act 'Cancel the lease of the apartment in Pushkin':
 			cla & *nl
 			'Attention: You won''t be able to return to your apartment when you cancel the lease.'
 			
 			act 'Return': gt'agentned', 'start'
-			act 'Cancel it': home_owned[4] = 0 & gs 'set_home', 1 & gt'agentned', 'start'		
+			act 'Cancel it': home_owned[4] = 0 & gt'agentned', 'start'
 		end
 	end
 end