Преглед изворни кода

[fixed] Incorrect variable variations for curr_home

KevinSmarts пре 3 година
родитељ
комит
fd6a241642
4 измењених фајлова са 20 додато и 20 уклоњено
  1. 1 1
      locations/Cheatmenu_din.qsrc
  2. 1 1
      locations/Komp.qsrc
  3. 17 17
      locations/obj_din.qsrc
  4. 1 1
      locations/saveupdater.qsrc

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -2456,7 +2456,7 @@ $cheatmenu['vartracker'] = {
 	'$locM: <<$locM>>'
 	'<font color = red>$CURLOC: <<$CURLOC>></font>'
 	'$location_type: <<$location_type>>'
-	'home_cur: <<home_cur>>'
+	'curr_home: <<curr_home>>'
 	'$home_town: <<$home_town>>'
 	'$home_name: <<$home_name>>'
 	'daystart: <<daystart>>'

+ 1 - 1
locations/Komp.qsrc

@@ -239,7 +239,7 @@ if $ARGS[0] = 'znak':
 
 			act 'Leave this website':gt 'komp', 'brows'
 		end
-	elseif home_cur ! 1 and home_cur ! 2 and home_cur ! 3 and home_cur ! 4 and home_cur ! 5:
+	elseif curr_home ! 1 and curr_home ! 2 and curr_home ! 3 and curr_home ! 4 and curr_home ! 5:
 		pcs_mood += rand(5, 10)
 		'You spend time looking at the various profiles, but it won''t let you register unless you have your own home and it is set as your current home.'
 		'Still, some of the pictures were quite raunchy and the more desperate profiles were really funny.'

+ 17 - 17
locations/obj_din.qsrc

@@ -130,9 +130,9 @@ if $ARGS[0] = 'description':
 	!!!
 
 	if ARRSIZE('home_owned') = 0:
-		'You have nowhere to live, if this is an error set your current home <a href="exec:gs ''obj_din'', ''cur_home''">here</a>.'
+		'You have nowhere to live, if this is an error set your current home <a href="exec:gs ''obj_din'', ''curr_home''">here</a>.'
 	else
-		'Your current home is <a href="exec:gs ''obj_din'', ''cur_home''"><<$home_name>></a>.'
+		'Your current home is <a href="exec:gs ''obj_din'', ''curr_home''"><<$home_name>></a>.'
 	end
 
 	if succubusflag = 1 and sucpcinfo >= 4:
@@ -233,7 +233,7 @@ if $ARGS[0] = 'description':
 	'</td></tr></table></center>'
 end
 
-if $ARGS[0] = 'cur_home':
+if $ARGS[0] = 'curr_home':
 	*clr & cla
 	!'<center><img src="images/system/icon/description.png"><br></center>'
 	'<center><h1><<$pcs_firstname>>''s Home Location</h1></center>'
@@ -243,20 +243,20 @@ if $ARGS[0] = 'cur_home':
 	*nl
 	act 'Return to main description': gt 'obj_din', 'description'	
 !!This is correct it just looks wrong
-	if home_owned[1] > 0: 'Set current home as <a href="exec:gs ''set_home'', 1 & gs ''obj_din'', ''cur_home''">City residential apartment</a>'
-	if home_owned[2] = 1: 'Set current home as <a href="exec:gs ''set_home'', 2 & gs ''obj_din'', ''cur_home''">Parent''s home in Pavlovsk</a>'
-	if home_owned[3] > 0: 'Set current home as <a href="exec:gs ''set_home'', 3 & gs ''obj_din'', ''cur_home''">My cottage in the cooperative farm</a>'
-	if home_owned[4] = 1: 'Set current home as <a href="exec:gs ''set_home'', 4 & gs ''obj_din'', ''cur_home''">Old town apartment</a>'
-	if home_owned[5] > 2: 'Set current home as <a href="exec:gs ''set_home'', 5 & gs ''obj_din'', ''cur_home''">My mansion</a>'
-	if home_owned[6] = 1: 'Set current home as <a href="exec:gs ''set_home'', 6 & gs ''obj_din'', ''cur_home''">My hotel room in Pavlovsk</a>'
-	if home_owned[7] = 1: 'Set current home as <a href="exec:gs ''set_home'', 7 & gs ''obj_din'', ''cur_home''">Nicholas'' apartment</a>'
-	if home_owned[8] = 1: 'Set current home as <a href="exec:gs ''set_home'', 8 & gs ''obj_din'', ''cur_home''">Niko''s apartment</a>'
-	if home_owned[9] = 1: 'Set current home as <a href="exec:gs ''set_home'', 9 & gs ''obj_din'', ''cur_home''">Uncle Sergey''s apartment</a>'
-	if home_owned[10] = 1: 'Set current home as <a href="exec:gs ''set_home'', 10 & gs ''obj_din'', ''cur_home''">Lyceum school</a>'
-	if home_owned[11] = 1: 'Set current home as <a href="exec:gs ''set_home'', 11 & gs ''obj_din'', ''cur_home''">University halls</a>'
-	if home_owned[12] = 1: 'Set current home as <a href="exec:gs ''set_home'', 12 & gs ''obj_din'', ''cur_home''">Hunter''s lodge in Gadukino</a>'
-	if home_owned[13] = 1: 'Set current home as <a href="exec:gs ''set_home'', 13 & gs ''obj_din'', ''cur_home''">Shared apartment in Pavlovsk</a>'
-	if home_owned[14] = 1: 'Set current home as <a href="exec:gs ''set_home'', 14 & gs ''obj_din'', ''cur_home''">Grandparent''s house in Gadukino</a>'
+	if home_owned[1] > 0: 'Set current home as <a href="exec:gs ''set_home'', 1 & gs ''obj_din'', ''curr_home''">City residential apartment</a>'
+	if home_owned[2] = 1: 'Set current home as <a href="exec:gs ''set_home'', 2 & gs ''obj_din'', ''curr_home''">Parent''s home in Pavlovsk</a>'
+	if home_owned[3] > 0: 'Set current home as <a href="exec:gs ''set_home'', 3 & gs ''obj_din'', ''curr_home''">My cottage in the cooperative farm</a>'
+	if home_owned[4] = 1: 'Set current home as <a href="exec:gs ''set_home'', 4 & gs ''obj_din'', ''curr_home''">Old town apartment</a>'
+	if home_owned[5] > 2: 'Set current home as <a href="exec:gs ''set_home'', 5 & gs ''obj_din'', ''curr_home''">My mansion</a>'
+	if home_owned[6] = 1: 'Set current home as <a href="exec:gs ''set_home'', 6 & gs ''obj_din'', ''curr_home''">My hotel room in Pavlovsk</a>'
+	if home_owned[7] = 1: 'Set current home as <a href="exec:gs ''set_home'', 7 & gs ''obj_din'', ''curr_home''">Nicholas'' apartment</a>'
+	if home_owned[8] = 1: 'Set current home as <a href="exec:gs ''set_home'', 8 & gs ''obj_din'', ''curr_home''">Niko''s apartment</a>'
+	if home_owned[9] = 1: 'Set current home as <a href="exec:gs ''set_home'', 9 & gs ''obj_din'', ''curr_home''">Uncle Sergey''s apartment</a>'
+	if home_owned[10] = 1: 'Set current home as <a href="exec:gs ''set_home'', 10 & gs ''obj_din'', ''curr_home''">Lyceum school</a>'
+	if home_owned[11] = 1: 'Set current home as <a href="exec:gs ''set_home'', 11 & gs ''obj_din'', ''curr_home''">University halls</a>'
+	if home_owned[12] = 1: 'Set current home as <a href="exec:gs ''set_home'', 12 & gs ''obj_din'', ''curr_home''">Hunter''s lodge in Gadukino</a>'
+	if home_owned[13] = 1: 'Set current home as <a href="exec:gs ''set_home'', 13 & gs ''obj_din'', ''curr_home''">Shared apartment in Pavlovsk</a>'
+	if home_owned[14] = 1: 'Set current home as <a href="exec:gs ''set_home'', 14 & gs ''obj_din'', ''curr_home''">Grandparent''s house in Gadukino</a>'
 	
 !!Apostrophe colour correction - KS ''''
 	'</td></tr></table></center>'

+ 1 - 1
locations/saveupdater.qsrc

@@ -240,7 +240,7 @@ end
 
 !! set $home_town variable and remove consequential obsolete variables
 if $home_town = '':
-	gs 'set_home', home_cur
+	gs 'set_home', curr_home
 	killvar 'svidboykino'
 	killvar 'svidboypark'
 	killvar 'svidboypark1'