1.3.1 hotfix

- Fixed a rare menu settings bug - Dogs restored - iOS & Mac build settings updated.
nkrapivin · Oct 15, 2019 · c158f55 · c158f55
1 parent d80e293
commit c158f55
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 16 deletions.
diff --git a/objects/oBall/Create_0.gml b/objects/oBall/Create_0.gml
@@ -6,4 +6,5 @@ activated = true;
 mx = -1;
 my = -1;
 gp_timerx = 0;
-gp_timery = 0;
+gp_timery = 0;
+stoptimer = 0;
diff --git a/objects/oBall/Step_0.gml b/objects/oBall/Step_0.gml
@@ -15,7 +15,9 @@ key_right = keyboard_check_pressed(vk_right) || gamepad_button_check_pressed(glo
 key_up = keyboard_check_pressed(vk_up) || gamepad_button_check_pressed(global.gp_id,gp_padu) || gp_timery < 1 && gamepad_axis_value(global.gp_id,gp_axislv) < -0.5;
 key_down = keyboard_check_pressed(vk_down) || gamepad_button_check_pressed(global.gp_id,gp_padd) || gp_timery < 1 && gamepad_axis_value(global.gp_id,gp_axislv) > 0.5;
 
-if (mouse_check_button(mb_left) && !moving && scrIsMobile())
+stoptimer = max(0,stoptimer-1);
+
+if (mouse_check_button(mb_left) && stoptimer == 0 && !moving && scrIsMobile())
 {
 	touch_pos[1] = mouse_y;
 	touch_pos[0] = mouse_x;

diff --git a/objects/oFloorStop/Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml b/objects/oFloorStop/Collision_fc6f0026-8881-4ae0-8b42-d27fe61dc745.gml
@@ -5,6 +5,10 @@ if (!Approached)
 	oBall.moving = false;
 	oBall.x = x;
 	oBall.y = y;
-	if (scrIsMobile()) mouse_clear(mb_left);
+	if (scrIsMobile())
+	{
+		mouse_clear(mb_left);
+		oBall.stoptimer = 5;
+	}
 	audio_play_sound(sfxBallMove,5,false);
 }
diff --git a/objects/oLevelSelectorNew/Draw_0.gml b/objects/oLevelSelectorNew/Draw_0.gml
@@ -43,7 +43,7 @@ else
 		else if (os_browser != browser_not_a_browser) //is HTML5
 			draw_text(960/2,544/2,"Custom Levels aren't supported on HTML5.\nSorry about that!\nJust click left trigger.");
 		else if (scrIsMobile())
-			draw_text(960/2,544/2,"No custom levels were found.\nPress 'Back' button to save your level.\nIf you saved your level but still don't see it\nTry re-opening this menu.");
+			draw_text(960/2,544/2,"Mobile platforms do not support custom levels.");
 	}
 }
 

diff --git a/objects/oLevelSelectorNew/KeyPress_8.gml b/objects/oLevelSelectorNew/KeyPress_8.gml
@@ -1,5 +1,9 @@
 /// @description write level as base64
+
+//room_goto(rMenu);
+
+/*
 if (selectedWorld != 3) && (os_browser != browser_not_a_browser || !scrIsMobile()) exit;//mobile only!!!
 var fname = get_string("Enter level file name (no extension!):","custom");
 var lvlstr= get_string("Enter level base64 string:","");
-scrWriteLevel(lvlstr,fname);
+scrWriteLevel(lvlstr,fname);*/
diff --git a/objects/objLevelSelectBack/Step_0.gml b/objects/objLevelSelectBack/Step_0.gml
@@ -1,5 +1,5 @@
 /// @description go back to main menu
-if (mouse_check_button_released(mb_left) && position_meeting(mouse_x,mouse_y,self)) || (keyboard_check_pressed(vk_escape)) || (gamepad_button_check_pressed(global.gp_id,gp_face2)) || (position_meeting(global.mousex,global.mousey,self) && gamepad_button_check_pressed(global.gp_id,gp_face1))
+if (mouse_check_button_released(mb_left) && position_meeting(mouse_x,mouse_y,self)) || (keyboard_check_pressed(vk_escape)) || keyboard_check_pressed(vk_backspace) || (gamepad_button_check_pressed(global.gp_id,gp_face2)) || (position_meeting(global.mousex,global.mousey,self) && gamepad_button_check_pressed(global.gp_id,gp_face1))
 {
 	room_goto(rMenu);
 }
diff --git a/options/android/options_android.yy b/options/android/options_android.yy
diff --git a/options/html5/options_html5.yy b/options/html5/options_html5.yy
diff --git a/options/ios/options_ios.yy b/options/ios/options_ios.yy
diff --git a/options/linux/options_linux.yy b/options/linux/options_linux.yy
diff --git a/options/mac/options_mac.yy b/options/mac/options_mac.yy
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
diff --git a/options/windowsuap/options_windowsuap.yy b/options/windowsuap/options_windowsuap.yy
diff --git a/scripts/scrSettingsSave/scrSettingsSave.gml b/scripts/scrSettingsSave/scrSettingsSave.gml
@@ -2,6 +2,16 @@
 global.savebuff = buffer_create(1,buffer_grow,1);
 
 ini_open_from_string("");
+
+//bugfix
+for (var i = 1; i < 31; i++)
+{
+	ini_write_real("World1Unlocked",string(i),global.UnlockedLevels[1,i]);
+	ini_write_real("World2Unlocked",string(i),global.UnlockedLevels[2,i]);
+	ini_write_real("World1Stars",string(i),global.StarCount[1,i]);
+	ini_write_real("World2Stars",string(i),global.StarCount[2,i]);
+}
+
 ini_write_real("Settings","BgmGain",global.BgmGain);
 ini_write_real("Settings","SndGain",global.SndGain);
 var inistring = ini_close();