[fixed] A number of old magic variable checks updated. Might explain why things were a bit odd

locations/Cheatmenu_din.qsrc

@@ -1083,7 +1083,7 @@ $cheatmenu['setAttrs'] = {
 		"
 		loop_index += 1
 		! Magic is the last attribute, so if it's a non-magic game we'll end the loop one iteration early
-		if MagikDostup = 0 and loop_index < arrsize('$att_name'):
+		if $start_type[1] ! 'nomagic' and loop_index < arrsize('$att_name'):
 			jump 'set_attrs_loop'
 		elseif loop_index < arrsize('$att_name') - 1:
 			jump 'set_attrs_loop'
@@ -1180,7 +1180,7 @@ $cheatmenu['stats'] = {
 	*p 'Spirit (<<sprt_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'sprt', 'Spirit'
 	*p 'Charisma (<<chrsm_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'chrsm', 'Charisma'
 	*p 'Perception (<<prcptn_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'prcptn', 'Perception'
-	if MagikDostup = 0: *p 'Magic (<<magik_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'magik', 'Magic'
+	if $start_type[1] ! 'nomagic': *p 'Magic (<<magik_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'magik', 'Magic'
 	*nl
 	*pl'<b>Sexual:</b>'
 	*pl 'Inhibition level (<<100 - inhib_lvl>>): ' & dynamic $cheatmenu['printStatLinks1'], 'inhib', 'Inhibition'
@@ -1223,7 +1223,7 @@ $cheatmenu['stats'] = {
 	*p 'Handy-work (<<hndiwrk_lvl>>) - Total (<<pcs_hndiwrk>>): ' & dynamic $cheatmenu['printStatLinks'], 'hndiwrk', 'Handy-work'
 	*p 'Pool (<<pool_lvl>>) - Total (<<pcs_pool>>): ' & dynamic $cheatmenu['printStatLinks'], 'pool', 'Pool'
 	*p 'Heels (<<pcs_heels>>) - Total (<<pcs_heels>>): ' & dynamic $cheatmenu['printStatLinks'], 'heels', 'Heels'
-	if MagikDostup = 0: *p 'Spell Casting (<<splcstng_lvl>>) - Total (<<pcs_splcstng>>): ' & dynamic $cheatmenu['printStatLinks'], 'splcstng', 'Spellcasting'
+	if $start_type[1] ! 'nomagic': *p 'Spell Casting (<<splcstng_lvl>>) - Total (<<pcs_splcstng>>): ' & dynamic $cheatmenu['printStatLinks'], 'splcstng', 'Spellcasting'
 	'</td><td width="50%" cellpadding="10" valign="top">'
 	*pl'<b>Combat:</b>'
 	*p 'Jabs (<<jab_lvl>>)- Total (<<pcs_jab>>): ' & dynamic $cheatmenu['printStatLinks'], 'jab', 'Jabs'

locations/MartinTalk.qsrc

@@ -390,7 +390,7 @@ if $ARGS[0] = '':
 			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.' 
 			'"What about you, <<$pcs_firstname>>? Do you believe in some higher power?"'
 			*nl
-			if MagikDostup = 1:
+			if $start_type[1] = 'nomagic':
 				'You ponder the question for a moment before you answer.' 
 				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."' 
 				*nl

locations/cikl.qsrc

@@ -440,7 +440,7 @@ end
 !!	Arousal
 !!------------------------------------------------------------------------------------------------------------
 
-if magikDostup = 0:
+if $start_type[1] ! 'nomagic':
 	if pcs_horny < 100:pcs_horny += pcs_vag
 else
 	if stat['virgin'] = 1:

locations/intro_city.qsrc

@@ -219,7 +219,6 @@ end
 if $ARGS[0] = 'welcome_intro':
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
-	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

locations/intro_customization.qsrc

@@ -421,7 +421,7 @@ if $ARGS[0] = 'modatt':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_react', 'Reaction'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_chrsm', 'Charisma'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_prcptn', 'Perception'
-	if MagikDostup = 0: gs 'intro_customization', 'modrel_setup2', 'pcs_magik', 'Magic'
+	if $start_type[1] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_magik', 'Magic'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_grades', 'Grades'
 	gs 'intro_customization', 'modrel_setup4', 'pcs_inhib', 'Inhibition'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_heels', 'Heels'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'modskl_men':
 	'<center><b>Mental Skills</b></center>'
 	*nl
 	killvar '$table_display'
-	if MagikDostup = 0: gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
+	if $start_type[1] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_humint', 'People skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_persuas', 'Persuasion'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_observ', 'Observation'

locations/intro_sg.qsrc

@@ -54,7 +54,6 @@ end
 if $ARGS[0] = 'five':
 	gs 'intro_sg_select', 'sg_settings'
 	gs 'intro_initialization'
-	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

locations/intro_uni.qsrc

@@ -232,7 +232,6 @@ if $ARGS[0] = 'welcome_intro':
 	day = 25
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
-	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

locations/intro_uni_tg.qsrc

@@ -477,7 +477,6 @@ end
 if $ARGS[0] = 'welcome_intro':
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
-	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

locations/journal.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'records':
 
 	'<center><h1>Journal</h1></center>'
 
-	if MagikDostup = 0:
+	if $start_type[1] ! 'nomagic':
 		'<center><h2>Spells</h2></center><br>'
 		'<center><h2>Spells to Cast</h2></center><br>'
 		func('spellBook','cast','$nonComSpells')

locations/lug.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'prut2':
 		act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'PushkinPark'
 	end
 
-	if MagikDostup ! 1 and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
+	if $start_type[1] ! 'nomagic' and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
 		if knowsfairy < 1 and fairyskip = 0:
 			$loc_arg = 'prut2'
 			xgt 'MagEncounterFairy'

locations/metro.qsrc

@@ -188,7 +188,7 @@ if $ARGS[0] = 'shop':
 		'Buy breast cream 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<bcream_have>>'
-	if MagikDostup = 0:
+	if $start_type[1] ! 'nomagic':
 		'Packet of pink chewing gum. There are 10 in one package.'
 		if money >= 200:
 			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'

locations/park_walkeventsrnd.qsrc

@@ -32,13 +32,13 @@ else
 !!night
 	!!Used to make a hunting easier the higher the suc level
 	if suchunt = 1: parkrand -= (succublvl-1)
-	if knowsfairy < 1 and MagikDostup ! 1:
+	if knowsfairy < 1 and $start_type[1] ! 'nomagic':
 		if rand (1, 4) <= pcs_magik:
 			fairyrand = 19
 		else
 			fairyrand = 21
 		end
-	elseif MagikDostup ! 1:
+	elseif $start_type[1] ! 'nomagic':
 		if (fairychat - fairyshoo) < 5 or ((fairychat - fairyshoo) < 10 and fairylooking = 1):
 			fairyrand = 19 - (fairychat - fairyshoo)
 		elseif fairylooking = 1:
@@ -50,7 +50,7 @@ else
 
 	if parkrand <= 5:
 		gt 'park_walkevents', '1'
-	elseif parkrand >= fairyrand and MagikDostup ! 1:
+	elseif parkrand >= fairyrand and $start_type[1] ! 'nomagic':
 		gt 'MagEncounterFairy'
 	else
 		gt 'park_walkevents', 'empty'

locations/pav_park.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = 'start':
 			minut += 15
 			place = 1
 			Frend_num = 0
-			if MagikDostup ! 1 and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19): gt 'MagEncounterFairy'
+			if $start_type[1] ! 'nomagic' and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19): gt 'MagEncounterFairy'
 			gt 'placer'
 		end
 	end

locations/stallion.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'rape':
 	gs 'stat'
 	'You feel his hot breath against your ear as he continues to thrust into your body. "You know what they call me? Stallion. They call me that because when I ejaculate into a bitch, she ends up pregnant. I''ve already knocked up eleven girls. You''re gonna be number twelve."'
 	stallionQ = 5
-	if MagikDostup = 0 and broodcurse = 0:
+	if $start_type[1] ! 'nomagic' and broodcurse = 0:
 		broodcurse = 1
 		if $start_type[1] = 'nomagic':
 			'You feel a tingling in your body. You are pretty sure it is something Stallion has done to you.'

locations/stat_display.qsrc

@@ -92,7 +92,7 @@ if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your bir
 if telefon['UnreadSMS'] > 0: $stat_msg += '<BR><b>You have <<telefon[''UnreadSMS'']>> unread message(s).</b><BR>'
 
 !New icon based menu.
-if MagikDostup = 0:
+if $start_type[1] ! 'nomagic':
 	$journal_tooltip = 'Spellbook & Journal'
 	$journalIcon = 'journal_magic.png'
 else
@@ -1298,7 +1298,7 @@ if enable_show_status = 0:
 	elseif Enable_scalepic = 2:
 		$st_temp='rgb(<<(16777216 + fcolor) mod 256>>,<<(16777216 + fcolor)/256 mod 256>>,<<(16777216 + fcolor)/65536>>)'
 		$stat_extra_msg += '<p><font color="<<$st_temp>>"><TABLE width="300" cellpadding="1" cellspacing="0"><TR><TD width="85%">'+FUNC('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD> Arousal</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '2', pain['total'], pain['total'])+'</TD><TD> Pain</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD> Health</TD></TR>'
-		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
+		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
 		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
 		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD> Thirst</TD></TR>'
@@ -1313,7 +1313,7 @@ if enable_show_status = 0:
 		gs 'indik', '1', pcs_health * 100 / healthmax, pcs_health
 		$stat_extra_msg += '<BR><<$ind>> Health'
 
-		if MagikDostup = 0:
+		if $start_type[1] ! 'nomagic':
 			gs 'indik', '1', pcs_mana * 100 / manamax, pcs_mana
 			$stat_extra_msg += '<BR><<$ind>> Mana'
 		end
@@ -1355,7 +1355,7 @@ else
 	if $stat_extra_msg ! null: $stat_extra_msg += '<br><a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">▲Attributes:</a>'
 	if Enable_scalepic = 2:
 		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD> Inhibition</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Reaction</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
-		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
+		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
 		if succubusflag = 1: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', sucexcess, sucexcess)+'</TD><TD> Succubus Energy</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD> Attractiveness</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
@@ -1378,7 +1378,7 @@ else
 		$stat_extra_msg += '<BR><<$ind>> Charisma'
 		gs 'indik', '1', pcs_prcptn, pcs_prcptn
 		$stat_extra_msg += '<BR><<$ind>> Perception'
-		if MagikDostup = 0:
+		if $start_type[1] ! 'nomagic':
 			gs 'indik', '1', pcs_magik, pcs_magik
 			$stat_extra_msg += '<BR><<$ind>> Magic'
 			if succubusflag = 1:
@@ -1409,7 +1409,7 @@ else
 		$stat_sktool_msg += ' <a href="exec:Enable_show_mental_skill = 1 & gs ''$menu_obnovit''">◇Mental</a>'
 	else
 		$stat_sktool_msg += ' <a href="exec:Enable_show_mental_skill = 0 & gs ''$menu_obnovit''">◆Mental</a>'
-		if pcs_splcstng > 0 and MagikDostup = 0: gs 'show_table', '<<pcs_splcstng>> Spell Casting', '2'
+		if pcs_splcstng > 0 and $start_type[1] ! 'nomagic': gs 'show_table', '<<pcs_splcstng>> Spell Casting', '2'
 		if pcs_humint > 0: gs 'show_table', '<<pcs_humint>> People skills', '2'
 		if pcs_persuas > 0: gs 'show_table', '<<pcs_persuas>> Persuasion', '2'
 		if pcs_observ > 0: gs 'show_table', '<<pcs_observ>> Observation', '2'

locations/treeCircEntry.qsrc

@@ -2,7 +2,7 @@
 ! Use this to insert an Entry Point to the Tree Cicle
 !	ARGS[0] = the EntryPoint ID name from $tpLocations[]
 
-if MagikDostup = 0:
+if $start_type[1] ! 'nomagic':
 
 	! Setup for teleport circle
 	if tpKnown[$ARGS[0]] = 1: