Browse Source

[fixed] description window getting cleared during the lover phonecalls. Removed trailing spaces

anjuna krokus 5 months ago
parent
commit
a1b5b338a2
1 changed files with 32 additions and 28 deletions
  1. 32 28
      locations/telefon.qsrc

+ 32 - 28
locations/telefon.qsrc

@@ -62,7 +62,11 @@ $telefon['footer'] = {
 !! ''''This is how we print the screen on to the Additional Dscription window
 !! ''''This is how we print the screen on to the Additional Dscription window
 $telefon['print'] = {
 $telefon['print'] = {
 	clr
 	clr
-	pl func('cleanHTML',dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
+	if menu_off = 0:
+		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'] + dyneval($telefon['footer']))
+	else
+		pl func('cleanHTML', dyneval($telefon['header']) + $telefon['body'])
+	end
 }
 }
 
 
 !! This is the formatting function for a row in the Contact List. SHould be run as a DYNEVAL()
 !! This is the formatting function for a row in the Contact List. SHould be run as a DYNEVAL()
@@ -340,7 +344,7 @@ if $ARGS[0] = 'IncomingCallChooser':
 	if i < 3 and hour > 5 and hour < 20:
 	if i < 3 and hour > 5 and hour < 20:
 		if pcs_lovers[i] = 1 and svidanie[i] = 0 and loverday[i] ! daystart and rand(1,100) > 95:
 		if pcs_lovers[i] = 1 and svidanie[i] = 0 and loverday[i] ! daystart and rand(1,100) > 95:
 			j = arrsize('$telefIncCall')
 			j = arrsize('$telefIncCall')
-			$telefIncCall[j] = "cls & gs 'telefon', 'lover', <<i>>"
+			$telefIncCall[j] = "gs 'telefon', 'lover', <<i>>"
 			$telefIncIcon[j] = 'images/characters/shared/headshots_generic/<<lover_picture[i]>>.jpg'
 			$telefIncIcon[j] = 'images/characters/shared/headshots_generic/<<lover_picture[i]>>.jpg'
 			$telefIncName[j] = $loverdesc[i]
 			$telefIncName[j] = $loverdesc[i]
 		end
 		end
@@ -754,8 +758,8 @@ end
 !{
 !{
 	Send SMS lists the current contacts, then clicking on a contact gives a list of messages that can be sent.
 	Send SMS lists the current contacts, then clicking on a contact gives a list of messages that can be sent.
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
-	
-	To add an incoming message 
+
+	To add an incoming message
 	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	You can have up to 4 pictures attached to the message
 	You can have up to 4 pictures attached to the message
@@ -780,19 +784,19 @@ end
 	$SMSPicture4[] = url for fourth picture sent as part of the message
 	$SMSPicture4[] = url for fourth picture sent as part of the message
 	SMSMessageRead[] = 0 unread, 1 read
 	SMSMessageRead[] = 0 unread, 1 read
 
 
-	Send Messages 
+	Send Messages
 	$SMSSendContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
 	$SMSSendContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
 	$SMSSendMessage[] = text for the sms message
 	$SMSSendMessage[] = text for the sms message
 	$SMSSendCode[] = Code to execute for Incoming call
 	$SMSSendCode[] = Code to execute for Incoming call
 	SMSSendRepeatable[] = 0 delete option after send, 1 don't delete option
 	SMSSendRepeatable[] = 0 delete option after send, 1 don't delete option
-	$SMSSendDeleteId[] = id passed by the caller 
+	$SMSSendDeleteId[] = id passed by the caller
 }
 }
 
 
 if $ARGS[0] = 'Phone_sms':
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
 	<font size=6>SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	
+
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>Icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>Icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
 
 
@@ -810,7 +814,7 @@ if $ARGS[0] = 'Phone_sms':
 		else
 		else
 			$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 			$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 			$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
 			$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-		end 
+		end
 
 
 		if SMSMessageRead[i] = 0: telefon['UnreadSMS'] += 1
 		if SMSMessageRead[i] = 0: telefon['UnreadSMS'] += 1
 		$telefon['body'] += dyneval($telefon['SMS'],i,$telefonCon['Icon'],$telefonCon['NPCName'],$SMSTime[i],SMSMessageRead[i])
 		$telefon['body'] += dyneval($telefon['SMS'],i,$telefonCon['Icon'],$telefonCon['NPCName'],$SMSTime[i],SMSMessageRead[i])
@@ -824,7 +828,7 @@ if $ARGS[0] = 'Phone_sms':
 	killvar 'i'
 	killvar 'i'
 end &! --- Phone_sms ---
 end &! --- Phone_sms ---
 
 
-!{ 
+!{
 	New SMS Message
 	New SMS Message
 	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
 	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
 	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
 	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
@@ -863,7 +867,7 @@ if $ARGS[0] = 'delete_sms':
 	telefon['SMSCount'] -= 1
 	telefon['SMSCount'] -= 1
 	if $ARGS[2] = 'all' and telefon['SMSCount'] > 0 :
 	if $ARGS[2] = 'all' and telefon['SMSCount'] > 0 :
 		gs 'telefon','delete_sms','0','all'
 		gs 'telefon','delete_sms','0','all'
-	end	
+	end
 	gs 'telefon', 'Phone_sms'
 	gs 'telefon', 'Phone_sms'
 end
 end
 
 
@@ -883,7 +887,7 @@ if $ARGS[0] = 'show_sms':
 	else
 	else
 		$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 		$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-	end 
+	end
 
 
 	!!If file extension is not given, .png is assumed
 	!!If file extension is not given, .png is assumed
 	if instr($telefonCon['Icon'],'.') = 0:
 	if instr($telefonCon['Icon'],'.') = 0:
@@ -924,9 +928,9 @@ if $ARGS[0] = 'show_sms':
 end
 end
 
 
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
-!{	
+!{
 	SMS Row in messages table
 	SMS Row in messages table
-	ARGS[0] = message id 
+	ARGS[0] = message id
 	$ARGS[1] = NPC icon
 	$ARGS[1] = NPC icon
 	$ARGS[2] = NPC Nickname
 	$ARGS[2] = NPC Nickname
 	$ARGS[3] = Time received
 	$ARGS[3] = Time received
@@ -969,12 +973,12 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0: 
+	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0:
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 	end
 	end
 !! Colour correction for editor ''''
 !! Colour correction for editor ''''
-	
+
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	!!iterating all Contacts
 	!!iterating all Contacts
 	i=0
 	i=0
@@ -1256,7 +1260,7 @@ end &! --- phone_call_receive ---
 
 
 if $ARGS[0] = 'phone_balance':
 if $ARGS[0] = 'phone_balance':
 	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
 	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
-		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 			$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 			$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 		elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 			$contractmessage = '<font size=6>Not enough minutes left on your contract to make a call</font><br>'
 			$contractmessage = '<font size=6>Not enough minutes left on your contract to make a call</font><br>'
@@ -1300,11 +1304,11 @@ if $ARGS[0] = 'phone_call_reject':
 end &! --- phone_call_reject ---
 end &! --- phone_call_reject ---
 
 
 if $ARGS[0] = 'Phone_megafon':
 if $ARGS[0] = 'Phone_megafon':
-	if subscription['monthly_calls'] = 1: 
-		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>' 
+	if subscription['monthly_calls'] = 1:
+		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>'
 	elseif subscription['metered_calls'] = 1:
 	elseif subscription['metered_calls'] = 1:
-		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left' 
-	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left'
+	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 		$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 		$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
@@ -1669,13 +1673,13 @@ if $ARGS[0] = 'callingTheLover' and loverGender[ARGS[1]] = 0:
 end
 end
 
 
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
-	cla
-	clr
+	cls
+	menu_off = 1
 	lover_number = ARGS[1]
 	lover_number = ARGS[1]
 	ring = 0
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
 	lover_days = daystart - loverday[lover_number]
-	!gs 'stat'
-	!gs 'telefon','phone_call_receive'
+	gs 'stat'
+	gs 'telefon', 'phone_call_receive'
 	svetrand = rand(0, 5)
 	svetrand = rand(0, 5)
 
 
 	if svetrand = 0:$sveta = 'cutie'
 	if svetrand = 0:$sveta = 'cutie'
@@ -1815,13 +1819,13 @@ if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 0:
 end
 end
 
 
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
 if $ARGS[0] = 'lover' and loverGender[ARGS[1]] = 1:
-	cla
-	clr
+	cls
+	menu_off = 1
 	lover_number = ARGS[1]
 	lover_number = ARGS[1]
 	ring = 0
 	ring = 0
 	lover_days = daystart - loverday[lover_number]
 	lover_days = daystart - loverday[lover_number]
-	!gs 'stat'
-	!gs 'telefon','phone_call_receive'
+	gs 'stat'
+	gs 'telefon', 'phone_call_receive'
 	svetrand = rand(0, 5)
 	svetrand = rand(0, 5)
 
 
 	if svetrand = 0:$sveta = 'cutie'
 	if svetrand = 0:$sveta = 'cutie'