diff --git a/objects/oCreditsText.object.gmx b/objects/oCreditsText.object.gmx index f67ec5b2..f88071b3 100644 --- a/objects/oCreditsText.object.gmx +++ b/objects/oCreditsText.object.gmx @@ -34,7 +34,7 @@ */ // Refer to key above -text = "*Another " + global.monsterStr + " 2 Remake;;;;;;;;;;;;*Producer;/Milton 'DoctorM64' Guasti;;*Graphic Design;Ramiro Negri=MichaelGabrielR;Jasper=Jack Witty;/Steve 'Sabre230' Rothlisberger;/Kirill '1Eni1' Fevralev;;*Promo Art;/Azima 'Zim' Khan;;*Writing;/James 'Ridley' Hobbs;/Paulo 'Latinlingo' Villalobos;;*Platform Engine Code;/Martin Piecyk;;*Music Composition;/Milton 'DoctorM64' Guasti;/Darren Kerwin;/Torbjørn 'Falcool' Brandrud;;*Debug;/Dragondarch;/Hemse;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;;*Playtesting;Jennifer Potter=Mario Crestanello;Live4Truths=Torbjørn 'Falcool' Brandrud;Lise Trehjørningen=Gabriel Kaplan;Nommiin=Nicolas 'Skol' Del Negro;Darren Kerwin=Robert Sephazon;;*Community Management;Dragonheart91=Ammypendent;/Karrde;;*Special Thanks;Nommiin=Tyler Rogers;Kousoru=Infinity's End;Isabelle Amponin=CapCom;/Nathan 'wickedclown' Hess;/The " + global.monsterStr + " Community;;;;*Source Code Reconstruction;/YellowAfterlife;;;;*Continued Revisions;;*Development;Gatordile=Lojemiru;/Alex 'Wanderer' Mack;;*Programming;Metroid3D=Scooterboot;/Craig Kostelecky;;*Art Lead;/Dannon 'Shmegleskimo' Yates;;*Art;ShirtyScarab=Cooper Garvin;/Chris 'Messianic' Oliveira;/ChloePlz;;*Debug;Miepee=EODTex;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;/Electrix;;*Spanish Localization;Diegomg=Imsu;;*German Localization;m3Zz=LPCaiser;Miepee=unknown;/fedprod;;*Italian Localization;/LetsPlayNintendoITA;/SadNES cITy e Vecna;/ReNext;;*French Localization;Atver=Vectrex28;;*Russian Localization;/DarkEspeon;;*Japanese Localization;/Gponys;;*Czech Localization;/Vectrex28;;*Special Thanks;Banjo=King Bore;Reaku the Crate=Grom PE;Sylandro=TheKhaosDemon;Iwantdevil=PixHammer;GaptGlitch=Nokbient;Nanassshy=kitronmacaron;/Jean-Samuel Pelletier;/Japanese Community;;;;;;;*Original " + global.monsterStr + " II Staff;;*Producer;/Gunpei Yokoi;;*Director;Hiroji Kiyotake=Hiroyuki Kimura;;*Main Programmer;/Takahiro Harada;;*Programmer;Masaru Yamanaka=Masao Yamamoto;/Isao Hirano;;*Graphic Designer;Hiroji Kiyotake=Hiroyuki Kimura;;*Program Assistant;Yuzuru Ogawa=Nobuhiro Ozaki;;*Sound Programmer;/Ryohji Yoshitomi;;*Designer;Makoto Kanoh=Masafumi Sakashita;Tomoyoshi Yamane=Takehiko Hosokawa;/Yasuo Inoue;;*Debug;Masaru Okadaga=Kenji Nishizawa;Hirofumi Matsuoka=Tohru Ohsawa;Kohta Fukui=Keisuke Terasaki;Kenichi Sugino=Hitoshi Yamagami;Katsuya Yamaoe=Yuji Hori;;;;;;;;;;/In Memory of Satoru Iwata;"; +text = "*Another " + global.monsterStr + " 2 Remake;;;;;;;;;;;;*Producer;/Milton 'DoctorM64' Guasti;;*Graphic Design;Ramiro Negri=MichaelGabrielR;Jasper=Jack Witty;/Steve 'Sabre230' Rothlisberger;/Kirill '1Eni1' Fevralev;;*Promo Art;/Azima 'Zim' Khan;;*Writing;/James 'Ridley' Hobbs;/Paulo 'Latinlingo' Villalobos;;*Platform Engine Code;/Martin Piecyk;;*Music Composition;/Milton 'DoctorM64' Guasti;/Darren Kerwin;/Torbjørn 'Falcool' Brandrud;;*Debug;/Dragondarch=Hemse;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;;*Playtesting;Jennifer Potter=Mario Crestanello;Live4Truths=Nommiin;/Torbjørn 'Falcool' Brandrud;/Nicolas 'Skol' Del Negro;Lise Trehjørningen=Gabriel Kaplan;Darren Kerwin=Robert Sephazon;;*Community Management;Dragonheart91=Ammypendent;/Karrde;;*Special Thanks;Nommiin=Tyler Rogers;Kousoru=Infinity's End;Isabelle Amponin=CapCom;/Nathan 'wickedclown' Hess;/The " + global.monsterStr + " Community;;;;*Source Code Reconstruction;/YellowAfterlife;;;;*Continued Revisions;;*Development;Gatordile=Lojemiru;/Alex 'Wanderer' Mack;;*Programming;" + global.monsterStr + "3D=Scooterboot;/Craig Kostelecky;;*Art Lead;/Dannon 'Shmegleskimo' Yates;;*Art;ShirtyScarab=Cooper Garvin;/Chris 'Messianic' Oliveira;/ChloePlz;;*Debug;Miepee=EODTex;/Esteban 'DruidVorse' Criado;/Verneri 'Naatiska' Viljanen;/Electrix;;*Localization;*Spanish;Imsu=Diegomg;*German;m3Zz=LPCaiser;Miepee=unknown;/fedprod;*Italian;LetsPlayNintendoITA=SadNES cITy e Vecna;/ReNext;*French;Atver=Vectrex28;*Russian;/DarkEspeon;*Japanese;/Gponys;*Czech;/Vectrex28;;*Special Thanks;Banjo=King Bore;Reaku the Crate=Grom PE;Sylandro=TheKhaosDemon;Iwantdevil=PixHammer;GaptGlitch=Nokbient;Nanassshy=kitronmacaron;/Jean-Samuel Pelletier;/Japanese Community;;;;*Original " + global.monsterStr + " II Staff;;*Producer;/Gunpei Yokoi;;*Director;Hiroji Kiyotake=Hiroyuki Kimura;;*Main Programmer;/Takahiro Harada;;*Programmer;Masaru Yamanaka=Masao Yamamoto;/Isao Hirano;;*Graphic Designer;Hiroji Kiyotake=Hiroyuki Kimura;;*Program Assistant;Yuzuru Ogawa=Nobuhiro Ozaki;;*Sound Programmer;/Ryohji Yoshitomi;;*Designer;Makoto Kanoh=Masafumi Sakashita;Tomoyoshi Yamane=Takehiko Hosokawa;/Yasuo Inoue;;*Debug;Masaru Okadaga=Kenji Nishizawa;Hirofumi Matsuoka=Tohru Ohsawa;Kohta Fukui=Keisuke Terasaki;Kenichi Sugino=Hitoshi Yamagami;Katsuya Yamaoe=Yuji Hori;;;;;;;;;;/In Memory of Satoru Iwata;"; // Constants TEXT_ROWS = string_count(";", text); @@ -56,8 +56,10 @@ for (var i = 0; i < TEXT_ROWS; i++) { } } +var strLength = string_length(text) + // Parse text -for (var i = 1; i <= string_length(text); i++) { +for (var i = 1; i <= strLength; i++) { // Get next char var nextChar = string_char_at(text, i); @@ -243,7 +245,7 @@ if (statetime > 520) { if (statetime == 700) vspeed = SCROLL_SPEED; // -0.34; // This stops the credits on the final line -if (y <= ystart + 17 - (TEXT_ROWS * 12)) vspeed = 0; +if (y <= ystart + 8 - (TEXT_ROWS * 12)) vspeed = 0; statetime++; diff --git a/objects/oOptionsDisplay.object.gmx b/objects/oOptionsDisplay.object.gmx index 7eda4f90..39be9640 100644 --- a/objects/oOptionsDisplay.object.gmx +++ b/objects/oOptionsDisplay.object.gmx @@ -68,7 +68,7 @@ opLanguage = i++; menuSize = i; // 1 larger than last item -vTargetY = 18 * menuSize + 30; +vTargetY = 18 * menuSize + 72; i = 0; @@ -84,6 +84,7 @@ for (i = 0; i < langCount; i += 1) { ini_open(global.language[i]); lang[i] = ini_read_string("Header", "Language", "[!]"); langAuthor[i] = ini_read_string("Header", "Author", "[!]"); + langAuthor2[i] = ini_read_string("Header", "Author2", "[!]"); ini_close(); } @@ -95,32 +96,6 @@ event_user(3); // Load current tip text global.tiptext = tip[global.curropt]; - - -/* - -global.curropt = 0; -lastitem = 12; // og 10 -active = 0; -alarm[0] = 5; -i = 0; -repeat (13) { // og 11 - global.canedit[i] = 1; - i += 1; -} -targety = 0; -view_object[0] = id; -timer = 0; -langno = array_length_1d(global.language); -for (i = 0; i < langno; i += 1) { - ini_open(global.language[i]); - lang[i] = ini_read_string("Header", "Language", "[!]"); - langAuthors[i] = ini_read_string("Header", "Author", "[!]"); - ini_close(); -} -event_user(0); -event_user(3); -global.tiptext = tip[global.curropt]; @@ -342,7 +317,7 @@ display_reset(0, global.opvsync); // Language if (global.curropt == opLanguage) { global.currentlanguage = wrap(global.currentlanguage + input, 0, langCount - 1); - + // Update events event_user(3); event_user(4); @@ -372,207 +347,6 @@ if (targetY != y) y += (targetY - y) / 10; timer -= 1; -if (timer < 0) timer = 8; - -/* -if (active) { - if (oControl.kDown > 0 && (oControl.kDownPushedSteps == 0 || oControl.kDownPushedSteps > 30 && timer == 0)) { - if (os_type == os_android) { - switch global.curropt { - // this is spaghetti but I am not going to shift every single - // menu id to add one option. This is dumb. - case 0: global.curropt = 10; break; - case 9: global.curropt = 12; break; - case 11: global.curropt = 3; break; - default: global.curropt += 1; break; - } - } else { - switch global.curropt { - // this is spaghetti but I am not going to shift every single - // menu id to add one option. This is dumb. - case 2: global.curropt = 10; break; - case 9: global.curropt = 12; break; - case 11: global.curropt = 3; break; - default: global.curropt += 1; break; - } - } - if (global.curropt > lastitem) global.curropt = 0; - while (global.candit[global.curropt] == 0) global.curropt += 1; - targetY = op[global.curropt].y + 8 + 8; - if (targetY > 256 + (sep*2) && op[7].visible) targetY = 256 + (sep*2); - if (targetY > 240 + (sep*2) && !op[7].visible) targetY = 240 + (sep*2); - if(os_type == os_android) { if (targetY > 224) targetY = 224; } - sfx_play(sndMenuMove); - global.tiptext = tip[global.curropt]; - } - if (oControl.kUp > 0 && (oControl.kUpPushedSteps == 0 || oControl.kUpPushedSteps > 30 && timer == 0)) { - //global.curropt -= 1; - if (os_type == os_android) { - switch global.curropt { // spaghetti woo - case 3: global.curropt = 11; break; - case 10: global.curropt = 0; break; - case 12: global.curropt = 9; break; - default: global.curropt -= 1; break; - } - } else { - switch global.curropt { // spaghetti woo - case 3: global.curropt = 11; break; - case 10: global.curropt = 2; break; - case 12: global.curropt = 9; break; - default: global.curropt -= 1; break; - } - } - if (global.curropt < 0) global.curropt = lastitem; - while (global.canedit[global.curropt] == 0) global.curropt -= 1; - targetY = op[global.curropt].y + 8 + 8; - if (targetY > 256 + (sep*2) && op[7].visible) targetY = 256 + (sep*2); - if (targetY > 240 + (sep*2) && !op[7].visible) targetY = 240 + (sep*2); - if(os_type == os_android) { if (targetY > 208) targetY = 208; } - sfx_play(sndMenuMove); - global.tiptext = tip[global.curropt]; - } - if (oControl.kLeft > 0 && oControl.kLeftPushedSteps == 0 && oControl.kDown == 0 && oControl.kUp == 0) { - if (global.curropt == 5) { - global.ophudshowmetrcount -= 1; - if (global.ophudshowmetrcount < 0) global.ophudshowmetrcount = 2; - } - if (global.curropt == 1) { - global.opscale -= 1; - if (global.opfullscreen && global.opscale < 0) global.opscale = 4; - if (!global.opfullscreen) { - if (global.opscale < 1) global.opscale = 4; - set_window_scale(global.opscale); - } - } - if (global.curropt == 7) { - oControl.mod_buttonsconfig -= 1; - if (os_type != os_android && oControl.mod_buttonsconfig < 0) oControl.mod_buttonsconfig = 3; - if (os_type == os_android && oControl.mod_buttonsconfig < 0) oControl.mod_buttonsconfig = 5; - event_user(2); - event_user(3); - event_user(4); - } - if (global.curropt == 9) { - global.currentlanguage -= 1; - if (global.currentlanguage < 0) global.currentlanguage = langno - 1; - event_user(2); - event_user(3); - event_user(4); - global.tiptext = tip[global.curropt]; - } - } - if (oControl.kRight > 0 && oControl.kRightPushedSteps == 0 && oControl.kDown == 0 && oControl.kUp == 0) { - if (global.curropt == 5) { - global.ophudshowmetrcount += 1; - if (global.ophudshowmetrcount > 2) global.ophudshowmetrcount = 0; - } - if (global.curropt == 1) { - global.opscale += 1; - if (global.opfullscreen && global.opscale > 4) global.opscale = 0; - if (!global.opfullscreen) { - if (global.opscale > 4) global.opscale = 1; - set_window_scale(global.opscale); - } - } - if (global.curropt == 7) { - oControl.mod_buttonsconfig += 1; - if (os_type != os_android && oControl.mod_buttonsconfig > 3) oControl.mod_buttonsconfig = 0; - if (os_type == os_android && oControl.mod_buttonsconfig > 5) oControl.mod_buttonsconfig = 0; - event_user(2); - event_user(3); - event_user(4); - } - if (global.curropt == 9) { - global.currentlanguage += 1; - if (global.currentlanguage > langno - 1) global.currentlanguage = 0; - event_user(2); - event_user(3); - event_user(4); - global.tiptext = tip[global.curropt]; - } - - - } - if (oControl.kLeft > 0 && oControl.kLeftPushedSteps == 0 || oControl.kRight > 0 && oControl.kRightPushedSteps == 0 && global.curropt < 12 && oControl.kDown == 0 && oControl.kUp == 0) { - if (global.curropt == 0) { - if(os_type != os_android) { - global.opfullscreen = !global.opfullscreen; - set_fullscreen(global.opfullscreen); - if (!global.opfullscreen) { - global.opscale = 1; - alarm[1] = 1; - } - } - else { - global.opvsync = !global.opvsync; - sfx_play(sndMenuMove); - display_reset(0, global.opvsync); - } - } - if (global.curropt == 2) { - global.opvsync = !global.opvsync; - display_reset(0, global.opvsync); - if (!global.opfullscreen) set_window_scale(global.opscale); - } - if (global.curropt == 3) global.opshowhud = !global.opshowhud; - if (global.curropt == 4) global.ophudshowmap = !global.ophudshowmap; - if (global.curropt == 6) global.ophudshowhints = !global.ophudshowhints; - if (global.curropt == 8) global.ophudshowlogmsg = !global.ophudshowlogmsg; - - if (global.curropt == 10) { // sensitivity mode - if (global.sensitivitymode == 1) { - global.sensitivitymode = 0; - } else { - global.sensitivitymode = 1; - } - event_user(2); // update text - } - if (global.curropt == 11) { // widescreen - if (global.widescreen_enabled == 1) { - global.widescreen_enabled = 0; - } else { - global.widescreen_enabled = 1; - } - if (room == rm_options) { - oControl.widescreen = global.widescreen_enabled; - if (global.widescreen_enabled == 0) { - view_visible[1] = false; - } - - if (global.opfullscreen == 0) { - set_window_scale(window_get_height()/240); - window_set_position(window_get_x()+((53-(global.widescreen_enabled*106))*(window_get_height()/240)),window_get_y()); - } - if (global.opfullscreen == 1 || os_type == os_android) { - display_reset(0, global.opvsync); - } - } - - event_user(2); // update text - } - - if(os_type == os_android) { - if(global.curropt != 0) { - sfx_play(sndMenuMove); - } - } - else sfx_play(sndMenuMove); - event_user(2); - } - if (oControl.kMenu1 && oControl.kMenu1PushedSteps == 0) { - if (global.curropt == 12) { - load_resources(); - save_gameoptions(); - view_object[0] = noone; - view_yview[0] = 0; - instance_create(50, 92, oOptionsMain); - instance_destroy(); - sfx_play(sndMenuSel); - } - } -} // if (active) -if (targetY != y) y += (targetY - y) / 10; -timer -= 1; if (timer < 0) timer = 8; @@ -623,39 +397,12 @@ op[opButtonType].label = get_text("ExtrasMenu", "Controller"); op[opShowScans].label = get_text("OptionsDisplay", "ScanNotifications"); op[opLanguage].label = get_text("OptionsDisplay", "Language"); -op[menuSize].label = get_text("GlobalOptions", "Exit"); - -with (oSS_Fg) { - opt_text1 = get_text("Subscreen", "Title_Options"); - tip1text = get_text("Subscreen", "Menu_Tip"); -} - -/* -op[50].text = get_text("OptionsDisplay", "Title_Display"); - -op[0].label = get_text("OptionsDisplay", "Fullscreen"); -if(os_type == os_android) { - op[0].label = get_text("OptionsDisplay", "VSync"); -} -if (global.opfullscreen) { - op[1].label = get_text("OptionsDisplay", "DisplayScale"); -} else op[1].label = get_text("OptionsDisplay", "WindowSize"); -op[2].label = get_text("OptionsDisplay", "VSync"); -op[51].text = get_text("OptionsDisplay", "Title_HUD"); -op[3].label = get_text("OptionsDisplay", "HUDDisplay"); -op[4].label = get_text("OptionsDisplay", "HUDMap"); -op[5].label = get_text("OptionsDisplay", "MonsterCounter"); -op[52].text = get_text("OptionsDisplay", "Title_Notifications"); -op[6].label = get_text("OptionsDisplay", "Hints"); -op[7].label = get_text("ExtrasMenu", "Controller"); -op[8].label = get_text("OptionsDisplay", "ScanNotifications"); -op[9].label = get_text("OptionsDisplay", "Language"); +op[53].label = get_text("OptionsDisplay", "Author") + " " + langAuthor[global.currentlanguage]; -op[10].label = get_text("Misc", "SensitivityMode"); +op[54].label = langAuthor2[global.currentlanguage]; -op[11].label = get_text("Misc", "Widescreen"); +op[menuSize].label = get_text("GlobalOptions", "Exit"); -op[12].label = get_text("GlobalOptions", "Exit"); with (oSS_Fg) { opt_text1 = get_text("Subscreen", "Title_Options"); tip1text = get_text("Subscreen", "Menu_Tip"); @@ -699,26 +446,6 @@ tip[opButtonType] = get_text("ExtrasMenu", "Controller_Tip"); tip[opShowScans] = get_text("OptionsDisplay", "ScanNotifications_Tip"); tip[opLanguage] = get_text("OptionsDisplay", "Language_Tip"); tip[menuSize] = get_text("GlobalOptions", "ExitMain_Tip"); - - -/* -tip[0] = get_text("OptionsDisplay", "Fullscreen_Tip"); -if(os_type == os_android) tip[0] = get_text("OptionsDisplay", "VSync_Tip"); -tip[1] = get_text("OptionsDisplay", "DisplayScale_Tip"); -tip[2] = get_text("OptionsDisplay", "VSync_Tip"); -tip[3] = get_text("OptionsDisplay", "HUDDisplay_Tip"); -tip[4] = get_text("OptionsDisplay", "HUDMap_Tip"); -tip[5] = get_text("OptionsDisplay", "MonsterCounter_Tip"); -tip[6] = get_text("OptionsDisplay", "Hints_Tip"); -tip[7] = get_text("ExtrasMenu", "Controller_Tip"); -tip[8] = get_text("OptionsDisplay", "ScanNotifications_Tip"); -tip[9] = get_text("OptionsDisplay", "Language_Tip"); - -tip[10] = get_text("Misc", "SensitivityMode_Tip"); - -tip[11] = get_text("Misc", "Widescreen_Tip"); - -tip[12] = get_text("GlobalOptions", "ExitMain_Tip"); @@ -834,70 +561,6 @@ if (global.ophudshowlogmsg) { // Language op[opLanguage].optext = lang[global.currentlanguage]; - - -/* -if (global.opfullscreen) { - op[0].optext = get_text("GlobalOptions", "Enabled"); - op[1].label = get_text("OptionsDisplay", "DisplayScale"); -} else { - op[0].optext = get_text("GlobalOptions", "Disabled"); - op[1].label = get_text("OptionsDisplay", "WindowSize"); -} -if (global.opscale == 0) op[1].optext = get_text("OptionsDisplay", "DisplayScale_Stretch"); -if (global.opscale == 1) op[1].optext = "1X"; -if (global.opscale == 2) op[1].optext = "2X"; -if (global.opscale == 3) op[1].optext = "3X"; -if (global.opscale == 4) op[1].optext = "4X"; -if (global.opvsync) { - op[2].optext = get_text("GlobalOptions", "Enabled"); - if(os_type == os_android) op[0].optext = get_text("GlobalOptions", "Enabled"); -} else { - op[2].optext = get_text("GlobalOptions", "Disabled"); - if(os_type == os_android) op[0].optext = get_text("GlobalOptions", "Disabled"); -} -if (global.opshowhud) { - op[3].optext = get_text("GlobalOptions", "Enabled"); -} else op[3].optext = get_text("GlobalOptions", "Disabled"); -if (global.ophudshowmap) { - op[4].optext = get_text("GlobalOptions", "Enabled"); -} else op[4].optext = get_text("GlobalOptions", "Disabled"); -if (global.ophudshowmetrcount == 0) op[5].optext = get_text("GlobalOptions", "Disabled"); -if (global.ophudshowmetrcount == 1) op[5].optext = get_text("OptionsDisplay", "MonsterCounter_Local"); -if (global.ophudshowmetrcount == 2) op[5].optext = get_text("OptionsDisplay", "MonsterCounter_Global"); -if (global.ophudshowhints) { - op[6].optext = get_text("GlobalOptions", "Enabled"); -} else op[6].optext = get_text("GlobalOptions", "Disabled"); -switch (oControl.mod_buttonsconfig) { - case 0: op[7].optext = get_text("ExtrasMenu", "XBox"); break; - case 1: op[7].optext = get_text("ExtrasMenu", "Playstation"); break; - case 2: op[7].optext = get_text("ExtrasMenu", "NintendoPro"); break; - case 3: op[7].optext = get_text("ExtrasMenu", "SNESColored"); break; - case 4: op[7].optext = get_text("ExtrasMenu", "MOGA"); break; - case 5: op[7].optext = get_text("ExtrasMenu", "OUYA"); break; - default: op[7].optext = "[!]"; -} -if (global.ophudshowlogmsg) { - op[8].optext = get_text("GlobalOptions", "Enabled"); -} else op[8].optext = get_text("GlobalOptions", "Disabled"); -op[9].optext = lang[global.currentlanguage]; -if (global.curropt == 5) { - if (global.ophudshowmetrcount == 0) global.tiptext = get_text("OptionsDisplay", "MonsterCounter_Disabled_Tip"); - if (global.ophudshowmetrcount == 1) global.tiptext = get_text("OptionsDisplay", "MonsterCounter_Local_Tip"); - if (global.ophudshowmetrcount == 2) global.tiptext = get_text("OptionsDisplay", "MonsterCounter_Global_Tip"); -} - -if (global.sensitivitymode) { - op[10].optext = get_text("GlobalOptions", "Enabled"); -} else { - op[10].optext = get_text("GlobalOptions", "Disabled"); -} - -if (global.widescreen_enabled) { - op[11].optext = get_text("GlobalOptions", "Enabled"); -} else { - op[11].optext = get_text("GlobalOptions", "Disabled"); -} @@ -926,7 +589,7 @@ for (var i = 0; i <= menuSize; i++) { } // Delete headers -for (var i = 50; i <= 52; i++) { +for (var i = 50; i <= 54; i++) { with (op[i]) instance_destroy(); } @@ -1050,6 +713,24 @@ op[opLanguage].label = get_text("OptionsDisplay", "Language"); op[opLanguage].optionid = opLanguage; i++; +// Author display +op[53] = instance_create(x, y + SPACER * i, oPauseOption); +// The space here will not carry from the lang file, so we manually insert it. +op[53].label = get_text("OptionsDisplay", "Author") + " " + langAuthor[global.currentlanguage]; +op[53].optionid = 53; +op[53].canEdit = 0; +op[53].color = c_gray; +i++; + +var author2text = get_text("OptionsDisplay", "Author"); +op[54] = instance_create(x + 8, y + SPACER * i, oPauseOption); +// The space here will not carry from the lang file, so we manually insert it. +op[54].label = langAuthor2[global.currentlanguage]; +op[54].optionid = 54; +op[54].canEdit = 0; +op[54].color = c_gray; +i++; + // Exit - This will always be the last option op[menuSize] = instance_create(x, y + SPACER * i, oPauseOption); op[menuSize].optionid = menuSize; @@ -1057,96 +738,6 @@ op[menuSize].label = get_text("GlobalOptions", "Exit"); // Update options text event_user(2); - - -/* -y -= 8; -sep = 16; -var i = 1; -op[50] = instance_create(x, y * i, oMenuLabel); -op[50].text = get_text("OptionsDisplay", "Title_Display"); -op[0] = instance_create(x, y + sep * i, oOptionLR); -op[0].label = get_text("OptionsDisplay", "Fullscreen"); -op[0].optionid = 0; -i++; -if(os_type == os_android) { // android, replace fullscreen op with vsync - op[0].label = get_text("OptionsDisplay", "VSync"); -} -op[1] = instance_create(x, y + sep * i, oOptionLR); -if (global.opfullscreen) { - op[1].label = get_text("OptionsDisplay", "DisplayScale"); -} else op[1].label = get_text("OptionsDisplay", "WindowSize"); -op[1].optionid = 1; -if(os_type == os_android) { // android, make op[1] invis - op[1].visible = false; - global.canedit[1] = 0; -} -i++; -op[2] = instance_create(x, y + sep * i, oOptionLR); -op[2].label = get_text("OptionsDisplay", "VSync"); -op[2].optionid = 2; -if(os_type == os_android) { // invis vsync op[2] on android - op[2].visible = false; - global.canedit[2] = 0; - i = 1; -} - -i++; -op[10] = instance_create(x, y + sep * i, oOptionLR); -op[10].label = get_text("Misc", "SensitivityMode"); -op[10].optionid = 10; - -i++; -op[11] = instance_create(x, y + sep * i, oOptionLR); -op[11].label = get_text("Misc", "Widescreen"); -op[11].optionid = 11; - -i++; -op[51] = instance_create(x, y + sep * i, oMenuLabel); -op[51].text = get_text("OptionsDisplay", "Title_HUD"); -i++; -op[3] = instance_create(x, y + sep * i, oOptionLR); -op[3].label = get_text("OptionsDisplay", "HUDDisplay"); -op[3].optionid = 3; -i++; -op[4] = instance_create(x, y + sep * i, oOptionLR); -op[4].label = get_text("OptionsDisplay", "HUDMap"); -op[4].optionid = 4; -i++; -op[5] = instance_create(x, y + sep * i, oOptionLR); -op[5].label = get_text("OptionsDisplay", "MonsterCounter"); -op[5].optionid = 5; -i++; -op[52] = instance_create(x, y + sep * i, oMenuLabel); -op[52].text = get_text("OptionsDisplay", "Title_Notifications"); -i++; -op[6] = instance_create(x, y + sep * i, oOptionLR); -op[6].label = get_text("OptionsDisplay", "Hints"); -op[6].optionid = 6; -i++; -op[7] = instance_create(x, y + sep * i, oOptionLR); -op[7].label = get_text("ExtrasMenu", "Controller"); -op[7].optionid = 7; -if ((os_type != os_android && !gamepad_is_connected(global.gamepadIndex)) || (os_type == os_android && (!global.joydetected || global.compatibilitymode)) || (os_type == os_android && global.compatibilitymode)) { - op[7].visible = false; - global.canedit[7] = 0; -} -else i++; -op[8] = instance_create(x, y + sep * i, oOptionLR); -op[8].label = get_text("OptionsDisplay", "ScanNotifications"); -op[8].optionid = 8; -i++; -op[9] = instance_create(x, y + sep * i, oOptionLR); -op[9].label = get_text("OptionsDisplay", "Language"); -op[9].optionid = 9; - - -i++; -op[12] = instance_create(x, y + sep * i, oPauseOption); -op[12].optionid = 12; -op[12].label = get_text("GlobalOptions", "Exit"); - -event_user(2); diff --git a/objects/oPauseOption.object.gmx b/objects/oPauseOption.object.gmx index f45148c0..afa03a6a 100644 --- a/objects/oPauseOption.object.gmx +++ b/objects/oPauseOption.object.gmx @@ -26,6 +26,7 @@ 1 enabled = 1; +color = c_white; @@ -55,7 +56,7 @@ if (global.curropt == optionid) { } draw_set_color(c_black); draw_text(x + 1, y - 3, label); -draw_set_color(c_white); +draw_set_color(color); if (enabled == 0) { draw_set_alpha(0.5); } else draw_set_alpha(1);