Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
(cherry picked from commit 19d7e16fa6
)
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
This commit is contained in:
parent
f088b1b460
commit
e6eeb03108
1 changed files with 3 additions and 7 deletions
|
@ -79,7 +79,7 @@
|
||||||
this.field_71417_B = new MouseHelper();
|
this.field_71417_B = new MouseHelper();
|
||||||
this.func_71361_d("Pre startup");
|
this.func_71361_d("Pre startup");
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
@@ -524,27 +535,35 @@
|
@@ -524,30 +535,39 @@
|
||||||
GL11.glLoadIdentity();
|
GL11.glLoadIdentity();
|
||||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||||
this.func_71361_d("Startup");
|
this.func_71361_d("Startup");
|
||||||
|
@ -117,14 +117,10 @@
|
||||||
this.field_152354_ay = null;
|
this.field_152354_ay = null;
|
||||||
this.field_71461_s = new LoadingScreenRenderer(this);
|
this.field_71461_s = new LoadingScreenRenderer(this);
|
||||||
|
|
||||||
@@ -553,6 +572,7 @@
|
|
||||||
this.func_71352_k();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLClientHandler.instance().onInitializationComplete();
|
+ FMLClientHandler.instance().onInitializationComplete();
|
||||||
try
|
if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
|
||||||
{
|
{
|
||||||
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
|
this.func_71352_k();
|
||||||
@@ -970,9 +990,11 @@
|
@@ -970,9 +990,11 @@
|
||||||
|
|
||||||
if (!this.field_71454_w)
|
if (!this.field_71454_w)
|
||||||
|
|
Loading…
Reference in a new issue