Merge remote-tracking branch '3xpurt/master'

locations/Cheatmenu_din.qsrc

@@ -1518,8 +1518,6 @@ $cheatmenu['setting'] = {
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="20" valign="top">'
 
-	'Mod management page: <a href="exec:gt ''mod_setting''">Here</a>'
-
 	if Enable_nogameover = 1:
 		'Prevent Non-Drama GAMEOVER: Currently ON - <a href="exec:Enable_nogameover = 0 & dynamic $cheatmenu[''setting'']">Turn OFF</a>'
 	else

locations/mod_setting.qsrc

@@ -1,8 +1,18 @@
 # mod_setting
 
 !'Mod system 1.0 by illume'
-*nl '<center><h1>MODs</h1></center>'
+gs 'obj_din', 'settingtabs'
+cla
+
+if settingmode = 1:
+	!value= 2, call from Character creation
+	act '<center><b>Return to character creation</b></center>': killvar 'menu_page' & gt 'begin', 'start'
+else
+	!call from Menu - Game settings
+	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
+end
 
+*nl '<center><h1>MODs</h1></center>'
 '<center>'
 '<b>WARNING</b>: Game slowdown may occur when installing too many mods, or mods with bad structure.'
 if mod_list > 0:
@@ -19,16 +29,16 @@ if mod_list > 0:
 		*p '<td><<$mod_info[2]>></td>'
 		!author
 		*p '<td><a href="exec:gs ''mod_<<$mod_info[0]>>_readme''"><img src="images/system/icon/anptekainfo.jpg"></a> <<$mod_info[3]>></td></tr>'
-		!description and readme		
+		!description and readme
 	else
 		'ERROR loading mod id <<mod_i>>, no mod name available'
 	end
-	
+
 	if mod_list > mod_i:
 		mod_i+=1
 		jump 'mod_alllist'
-	end	
-	killvar 'mod_info'	
+	end
+	killvar 'mod_info'
 	'</table>'
 else
 	'<br>You have no Mods activated.'
@@ -50,10 +60,10 @@ act 'Install new mod':
 	$mod_author[mod_list] = $mod_info[2]
 	$mod_desc[mod_list] = $mod_info[3]
 	gt curloc
-end 
+end
 act 'Disable all mods':
 	if input('Are you sure? ALL mod will be disabled!<br>please input <b>qqq</B> to confirm') = 'qqq':
-		KILLQST 
+		KILLQST
 		set mod_list=0
 		KILLVAR '$mod_name'
 		KILLVAR '$mod_version'
@@ -64,9 +74,5 @@ act 'Disable all mods':
 		act 'Continue':goto curloc
 	end
 end
-act 'Return to settings index':
-	gs '$menu_setting'
-end
-
 --- mod_setting ---------------------------------
 

locations/obj_din.qsrc

@@ -50,11 +50,13 @@ if $ARGS[0] = 'settingtabs':
 	!1: Display
 	!2: Status
 	!3: Phone
+	!4: Mods
 	'<center><b><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
-	if menu_page = 0:'<th>Gameplay Settings</th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+''
-	if menu_page = 1:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th>Display Settings</th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+''
-	if menu_page = 2:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th>Status Window Settings</th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+''
-	if menu_page = 3:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th>Phone Theme Settings</th>')+''
+	if menu_page = 0:'<th>Gameplay Settings</th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'
+	if menu_page = 1:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th>Display Settings</th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'
+	if menu_page = 2:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th>Status Window Settings</th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'
+	if menu_page = 3:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th>Phone Theme Settings</th>')+'<th><a href="exec:menu_page = 4 & gt ''mod_setting''">Mods</a></th>'
+	if menu_page = 4:'<th><a href="exec:menu_page = 0 & dynamic $cheatmenu[''setting'']">Gameplay Settings</a></th><th><a href="exec:menu_page = 1 & dynamic $cheatmenu[''display'']">Display Settings</a></th><th><a href="exec:menu_page = 2 & dynamic $cheatmenu[''status'']">Status Window Settings</a></th>'+iif(settingmode = 1,'','<th><a href="exec:menu_page = 3 & dynamic $cheatmenu[''theme'']">Phone Theme Settings</a></th>')+'<th>Mods</th>'
 	'</tr></table></b></center>'
 	if settingmode = 1:
 		!value= 2, call from Character creation