[fixed] Some legacy swallow variable usage and switching the events they are in to use cum_call for the swallowing

locations/BDsex.qsrc

@@ -480,10 +480,7 @@ if $ARGS[0] = 'swallow':
 		sexcontra = 0
 	else
 		'Thick jets of sharply smelling sperm fill your mouth.'
-		spafinloc = 12
-		sexpartkno = 1
-		gs 'cum_manage'
-		swallow += 1
+		gs 'cum_call', 'mouth_swallow', $boy, 1
 	end
 	gs 'stat'
 	act 'Brush up':gt 'BDsex', 'end'

locations/Club2.qsrc

@@ -41,9 +41,7 @@ if $ARGS[0] = 'toilet1':
 		
 			act 'Swallow':
 				*clr & cla
-				swallow += 1
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth_swallow', $boy
 				money += 1000
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/glory3.jpg"></center>'
 				*nl
@@ -171,15 +169,12 @@ if $ARGS[0] = 'toilet2':
 						'2,000 RUB pokes through the hole.'
 
 						guy += 2
-						swallow += 2
 						gs 'npcgeneratec', 0, 'Gloryhole Client', rand(18,60)
 						gs 'boyStat', $npclastgenerated
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth_swallow', $boy
 						gs 'npcgeneratec', 0, 'Gloryhole Client', rand(18,60)
 						gs 'boyStat', $npclastgenerated
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth_swallow', $boy
 						gs 'arousal', 'end'
 						gs 'stat'
 						

locations/andrey.qsrc

@@ -426,11 +426,8 @@ if $ARGS[0] = 'fired1':
 	*clr
 	menu_off = 1
 	if sobulaginsex = 0:sobulaginsex = 1 & guy += 1
-	swallow += 1
 	gs 'boyStat', 'A101'
-	sexpartkno = 1
-	spafinloc = 12
-	gs 'cum_manage'
+	gs 'cum_call', 'mouth_swallow', $boy, 1
 	young_shop_miss = 0
 	young_shop_salary = 1
 	young_shop_bonus = 2

locations/bedr.qsrc

@@ -150,9 +150,8 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					*clr
 					menu_off = 1
 					husbanstrapon = 2
-					swallow += 1
-					spafinloc = 12
-					gs 'cum_manage'
+					gs 'boyStat', $HusID
+					gs 'cum_call', 'mouth_swallow', $boy, 1
 					'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h1.jpg"></center>'
 					'You pull out the plug and replace with it with a dildo, <<$husName>> did not even budge. You slowly move the dildo in and out, trying not to wake him up. You notice his cock starts to get rock hard, and <<$husName>> starts to moan softly, but is still asleep. With the dildo in his ass, his dick starts to throb, it seems like he is going to cum. You take his dick in your mouth and you don''t need to suck on it for long. He starts to cum, you swallow it and completely clean his cock. You carefully put back on his underpants.'
 
@@ -173,9 +172,8 @@ if husbandrink = 10 and hour > 20 and hour < 23 and husbanstrapon = 0:
 					menu_off = 1
 					minut += 20
 					husbanstrapon = 3
-					swallow += 1
-					spafinloc = 12
-					gs 'cum_manage'
+					gs 'boyStat', $HusID
+					gs 'cum_call', 'mouth_swallow', $boy, 1
 					pcs_horny += 30
 					'<center><img <<$set_imgh>> src="images/characters/city/husband/sex/h2.jpg"></center>'
 					'You put on the strapon and pull out the butt plug. You gently move the shaft of the strapon inside his ass, <<$husName>>  moves but doesn''t wake up. You continue to slowly move it in and out, trying not to wake him. You notice his cock is getting rock hard and <<$husName>> starts to moan softly, still not waking up. Hopeing that he won''t wake up, you increase your speed and push the entire length of the strapon into his has. You see his hard dick and you start to stroke it in addition to pounding him like a little bitch. Realizing he is not far from cumming, you pull out and finish him by giving him a blowjob. He cums inside it, you swallow it down and clean his cock. You carefully put back on his underpants.'

locations/booty_call_after.qsrc

@@ -898,7 +898,7 @@ if $ARGS[0] = 'cum_clean':
 		act'Lick your fingers clean':
 			gs'stat'
 			gs 'cum_cleanup', 'cleanloc'
-			swallow += 1
+			stat['swallow'] += 1
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
 			$npc_apt_bedroom[$boy]

locations/booty_call_cum.qsrc

@@ -645,7 +645,7 @@ if $ARGS[0] = 'facial_tongue_swallow':
 		end
 		act'Gulp':
 			cla & *clr
-			swallow += 1
+			stat['swallow'] += 1
 			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial26.mp4"></video></center>'
 			if orgasm > booty_call['orgasm']:
 				'A few seconds go by and no more spurts of cum land on you so you close your mouth and swallow, gulping down the entire load. You pant heavily in the aftershocks of your orgasm, looking up at <<$npc_firstname[$boy]>> through cum-glazed eyes.'
@@ -861,7 +861,7 @@ if $ARGS[0] = 'cum_mouth':
 			booty_call['swallow'] = 1
 			booty_call['swallow_count'] += 1
 			$booty_call['last_cum'] = 'swallow'
-			swallow += 1
+			stat['swallow'] += 1
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow3.mp4"></video></center>'
 			'Taking a step back, you open your mouth again to show <<$npc_firstname[$boy]>> how much cum is still inside it. With a deep breath, you swallow the entire load in one gulp, sticking your tongue back out again to show him that it''s all gone.'

locations/cfnm.qsrc

@@ -132,9 +132,7 @@ end
 
 if $ARGS[0] = 'blow3':
 	*clr & cla
-	spafinloc = 12
-	gs 'cum_manage'
-	swallow += 1
+	gs 'cum_call', 'mouth_swallow', $boy, 1
 	fotoCFNMblowjobCum += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/swallow.jpg"></center>'

locations/city_drugden.qsrc

@@ -423,10 +423,8 @@ if $ARGS[0] = 'drugslut':
 				act 'Suck his cock':
 					*clr & cla
 					guy += 1
-					swallow += 1
 					NarkShmaraTimes += 1
-					spafinloc = 12
-					gs 'cum_manage'
+					gs 'cum_call', 'mouth_swallow', $boy, 1
 					gs 'dinSex', 'std_trigger'
 					'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/bj.jpg"></center>'
 					'You need the drugs so badly, you drop to your knees automatically and quickly pull his pants down without even thinking of rejecting him. His cock is still flaccid but you close your lips around it anyway, doing the best you can to arouse him. You slowly feel his cock grow inside your mouth and suck him off obediently, until you feel several warm jets of sperm land on the back of your throat.'

locations/city_kafe2.qsrc

@@ -133,11 +133,8 @@ if $ARGS[0] = 'givi':
 						act 'Continue to suck.':
 							cla
 							*clr
-							swallow += 1
 							gs 'boyStat', 'A41'
-							sexpartkno = 1
-							spafinloc = 12
-							gs 'cum_manage'
+							gs 'cum_call', 'mouth_swallow', $boy, 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum31.jpg"></center>'
 							'A hot jet of sperm hits the back of your throat. You start to swallow cum, and Givi continues to cum in your mouth. Finally the flow of hot, pungent liquid stops.'

locations/city_kafeevents3.qsrc

@@ -48,12 +48,9 @@ if $ARGS[0] = 'house':
 					gs 'stat'
 					gs 'dinSex', 'std_trigger_oral'
 					'Finally, the guy fills your mouth with his hot sperm you have nowhere to go so you swallow it. The taxi stopped and <<$boydesc>> you puts you out on the street.'
-					swallow += 1
-					sexpartkno = 1
-					spafinloc = 12
+					gs 'cum_call', 'mouth_swallow', $boy, 1
 					gs 'arousal', 'end'
 					gs 'stat'
-					gs 'cum_manage'
 
 					act 'Leave':gt 'city_residential'
 				end
@@ -198,10 +195,7 @@ if $ARGS[0] = '0':
 				'You feel like a hot jet of sperm hits you in the throat. You have a mouth full of sperm.'
 				act 'Swallow':
 					cla
-					swallow += 1
-					sexpartkno = 1
-					spafinloc = 12
-					gs 'cum_manage'
+					gs 'cum_call', 'mouth_swallow', $boy, 1
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<<$boydesc>> looks at you as you swallow his sperm.'
@@ -332,10 +326,7 @@ if $ARGS[0] = 'toilet':
 			'You feel like a hot jet of sperm hits you in the throat. You have a mouth full of sperm.'
 			act 'Swallow':
 				cla
-				swallow += 1
-				sexpartkno = 1
-				spafinloc = 12
-				gs 'cum_manage'
+				gs 'cum_call', 'mouth_swallow', $boy, 1
 				'<<$boydesc>> looks at you as you swallow his sperm.'
 				gs 'arousal', 'end'
 				gs 'stat'

locations/city_marketsex.qsrc

@@ -103,14 +103,12 @@ if $ARGS[0] = 'the_beginning':
 						if hasansex = 0:hasansex = 1 & guy += 1
 						
 						pcs_vag += 1
-						swallow +=1
 						gang += 1
 						gs 'boyStat', 'A91'
 						spafinloc = 4
 						gs 'cum_manage'
 						gs 'boyStat', 'A92'
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth_swallow', $boy, 1
 						
 						money += 5000
 						'<center><img <<$set_imgh>> src="images/shared/sex/group/rinkrug.jpg"></center>'
@@ -142,9 +140,7 @@ if $ARGS[0] = 'the_beginning':
 			if palevorin = 0:palevorin = 1 & guy += 1
 
 			gs 'boyStat', 'A73'
-			swallow +=1
-			spafinloc = 12
-			gs 'cum_manage'
+			gs 'cum_call', 'mouth_swallow', $boy, 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/deep4.jpg"></center>'
 			'You kneel down in front of Arthur as he takes his <<dick>>cm <<$dick_girth>> cock out. You take it into your mouth and start sucking it, Arthur letting you guide the action and do all the work, only occasionally thrusting himself down your throat and making you gag.'
 
@@ -194,13 +190,10 @@ if $ARGS[0] = 'the_beginning':
 						if hasansex = 0:hasansex = 1 & guy += 1
 
 						gang += 1
-						swallow +=1
 						gs 'boyStat', 'A91'
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth_swallow', $boy, 1
 						gs 'boyStat', 'A92'
-						spafinloc = 12
-						gs 'cum_manage'
+						gs 'cum_call', 'mouth_swallow', $boy, 1
 						money += 5000
 						'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/rintri.jpg"></center>'
 						'You nod your head and the two men immediately walk over and pull their dicks out. You start sucking them in turn, but they sometimes force you to suck both at the same time.'
@@ -241,14 +234,11 @@ if $ARGS[0] = 'group':
 		'<center><img <<$set_imgh>> src="images/shared/sex/group/triplep.jpg"></center>'
 		'Satisfied with this, Abdul stops and lies down on a couch, pulling you over with him. You straddle him and feel his <<dick>>cm <<$dick_girth>> dick slide inside your pussy as Arthur stands to the side and pulls your head towards him.'
 		
-		swallow +=1
 		gang += 1
 		anal += 1
-		spafinloc = 12
-		gs 'cum_manage'
+		gs 'cum_call', 'mouth_swallow', $boy, 1
 		gs 'boyStat', 'A73'
-		spafinloc = 12
-		gs 'cum_manage'
+		gs 'cum_call', 'mouth_swallow', $boy, 1
 		spafinloc = 11
 		gs 'cum_manage'
 		'You open your mouth and start sucking his <<dick>>cm <<$dick_girth>> dick while Hassan kneels down behind you and you feel the tip of his cock rubbing against your asshole. You groan in pain as he forces his dick into your ass.'

locations/city_nightclub.qsrc

@@ -416,11 +416,8 @@ if $ARGS[0] = 'dance':
 								*clr & cla
 								pcs_horny += 10
 								minut += 10
-								swallow += 1
 								gs 'boystat', 'A81'
-								sexpartkno = 1
-								spafinloc = 12
-								gs 'cum_manage'
+								gs 'cum_call', 'mouth_swallow', $boy, 1
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum<<rand(34, 47)>>.jpg"></center>'
 								'Streams of sperm hit you in the mouth and began to run down your <<$pc_desc[''lips'']>> lips. Alexei wiped his dick on your <<$pc_desc[''lips'']>> lips and put it away in his pants.'
@@ -837,9 +834,7 @@ if $ARGS[0] = 'sex':
 		act 'Swallow his cum':
 			cla
 			*clr
-			swallow += 1
-			spafinloc = 12
-			gs 'cum_manage'
+			gs 'cum_call', 'mouth_swallow', $boy
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/clubswallow.jpg"></center>'
 			'The guy came in your mouth, you can feel his hot and salty semen pouring into it. Without hesitation you swallow it, you can''t tell why, but somehow you start to enjoy the taste of fresh, warm sperm.'
 

locations/city_park.qsrc

@@ -605,9 +605,7 @@ if $ARGS[0] = 'prost':
 				gs 'npcgeneratec', 0, 'Client', rand(15,30)
 				gs 'boyStat', $npclastgenerated
 				if prezik = 0:
-					swallow += 1
-					spafinloc = 12
-					gs 'cum_manage'
+					gs 'cum_call', 'mouth_swallow', $boy
 					'Client started cumming in your mouth, you continued to suck and swallow his hot, tart sperm.'
 					gs 'dinSex', 'std_trigger_oral'
 				elseif prezik > 0:

locations/dimaEv.qsrc

@@ -120,9 +120,7 @@ if $ARGS[0] = 'firstvisitsex':
 		if dimadalrand = 0:
 			act 'Further':
 				*clr & cla
-				spafinloc = 12
-				gs 'cum_manage'
-				swallow += 1
+				gs 'cum_call', 'mouth_swallow', $boy, 1
 				dimasexday = daystart
 				gs 'stat'
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/dimka/sex/bjcum.mp4"></video></center>'
@@ -149,9 +147,7 @@ if $ARGS[0] = 'firstvisitsex':
 		elseif dimadalrand = 2:
 			act 'Further':
 				*clr & cla
-				spafinloc = 12
-				gs 'cum_manage'
-				swallow += 1
+				gs 'cum_call', 'mouth_swallow', $boy, 1
 				if pcs_throat < 16: pcs_throat += 1
 				if pcs_makeup ! 1: pcs_makeup = 0
 				if maxdra = 2: maxdra = 3
@@ -404,9 +400,7 @@ if $ARGS[0] = 'dimkaabuse0':
 		'Your mouth is being held widely open by the ring and Dimka seems a little blurry due to your eyes watering. It tastes like the ring in your mouth was dipped in lemon juice and your saliva begins streaming from your mouth. Dimka takes a moment to admire you then he takes out his iron hard <<dick>>cm <<$dick_girth>> cock and shoves it into your mouth.'
 		act 'Further':
 			*clr & cla
-			spafinloc = 12
-			gs 'cum_manage'
-			swallow += 1
+			gs 'cum_call', 'mouth_swallow', $boy, 1
 			if pcs_makeup ! 1: pcs_makeup = 0
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/gagbj.jpg"></center>'
 			'Dimka''s cock enters your mouth through the ring and drives it to the entrance to your throat. The ring prevents you from doing anything to stop him except to try to use your tongue to force him out. The actions of your tongue on his cock only seem to excite him further. You gag as the head of his dick presses up against the soft palate at the back of your mouth. Dimka pulls his cock back then with all his strength drives it deep into your throat. You choke and gag as drool flows from your mouth, mixing with your tears and snot on your face as you struggle to breath through your nose. Dimka fiercely drives his penis in your mouth, fucking your throat until it burns like fire. You almost faint from suffocation as you choke on the cock jammed deeply inside of you as it spews its slimy load down your throat. To your relief, Dimka''s cock begins to soften and he pulls it out of you. He then takes the gag out of your mouth and uncuffs your wrists.'
@@ -422,9 +416,7 @@ end
 if $ARGS[0] = 'dimkaabuse1':
 	*clr & cla
 	if maxdradrug = 1: maxdradrug = 2
-	spafinloc = 12
-	gs 'cum_manage'
-	swallow += 1
+	gs 'cum_call', 'mouth_swallow', $boy, 1
 	if pcs_makeup ! 1: pcs_makeup = 0
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/ab.jpg"></center>'
 	'Dimka roughly pulls off your panties and puts them on your head. He inserts his penis into your mouth and begins to fuck you hard in the mouth. Your throat is burning with fire from the fact that his <<dick>>cm <<$dick_girth>> cock penetrates you nearly to the balls on every thrust. Dimka growls at you "A cocksucker''s mouth is her second pussy, and what should be done with a pussy? Fuck it hard, right to the uterus!" Dimka slaps you on the cheek with his hand "Take it in your mouth pussy!" The dick in your mouth starts to cum and fills your mouth with sperm, you swallow.'
@@ -560,9 +552,7 @@ end
 if $ARGS[0] = 'dimkaabuse9':
 	*clr & cla
 	bja += 1
-	spafinloc = 12
-	gs 'cum_manage'
-	swallow += 1
+	gs 'cum_call', 'mouth_swallow', $boy, 1
 	dimaFilm = 1
 	gs 'boyStat', 'A1'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/filming.jpg"></center>'
@@ -591,9 +581,7 @@ if $ARGS[0] = 'dimkaabuse10':
 		gs 'stat'
 		act 'Further':
 			*clr & cla
-			spafinloc = 12
-			gs 'cum_manage'
-			swallow += 1
+			gs 'cum_call', 'mouth_swallow', $boy, 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/gagbj.jpg"></center>'
 			'Dimka slips his <<dick>>cm <<$dick_girth>> dick through the ring in your mouth and rams it down your throat. You''re choking a bit, Dimka then drives his dick as far down your throat as it will go. Drool flows from your mouth, tears from your eyes and snot from your nose. Dimka furiously drives his penis in your mouth, causing your throat to feel like it is burning.'
 			'Finally, he groans and with his cock balls deep in your mouth, he begins to cum in your throat. You almost faint from suffocation. Finally Dimka pulls his dick out of your mouth, then he takes the ring-gag out of your mouth and uncuff your hands.'

locations/event.qsrc

@@ -64,9 +64,7 @@ if $ARGS[0] = 'blow':
 	gs 'stat'
 	act 'Continue sucking.':
 		cla
-		swallow += 1
-		spafinloc = 12
-		gs 'cum_manage'
+		gs 'cum_call', 'mouth_swallow', $boy, 1
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum30.jpg"></center>'
 		'A jet of hot sperm hits you in the mouth. You begin to swallow cum, and <<$loverdesc[lover_number]>> continues to cum in your mouth. Finally, the flow of hot pungent liquid stops.'
 
@@ -208,7 +206,6 @@ if $ARGS[0] = 'dima4':
 	cls
 	guy += 2
 	pcs_throat += 1
-	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/dmitry/sex/dima.jpg"></center>'
 	'They stand next to the bed, you kneel down and take Alexs dick in your mouth then Dimas. First you suck and lick the heads, then start swallowing right down the shaft.'
 	'Dima takes you by the chin, spits in your mouth and begins to slap his cock against your cheeks, then sitting on the bed, grabs you by the hair and begins to roughly fuck you in the mouth, periodically slaping your cheeks.'

locations/zaprFWash.qsrc

@@ -768,6 +768,7 @@ if $ARGS[0] = 'blowjobEndMouthSwallow':
 	'You gulp down the mouthful of sperm and then present your tongue as proof that all of his seed is now in your belly.'
 	'The man smiles, slaps you mildly on your face and says: "What a nice young slut you are. Next time I need a refill, I''ll be sure to stop by."'
 	
+	stat['swallow'] += 1
 	gs 'arousal', 'end'
 	gs 'stat'