camera + gui fix
This commit is contained in:
parent
d45cd7ec2c
commit
4a3828e310
2 changed files with 5 additions and 5 deletions
|
@ -264,7 +264,7 @@ public class Game implements IThreadListener {
|
||||||
private boolean secondary;
|
private boolean secondary;
|
||||||
private boolean tertiary;
|
private boolean tertiary;
|
||||||
private boolean quarternary;
|
private boolean quarternary;
|
||||||
private boolean cameraUsed;
|
private boolean showHud = true;
|
||||||
public boolean jump;
|
public boolean jump;
|
||||||
public boolean sneak;
|
public boolean sneak;
|
||||||
public boolean debugCamEnable;
|
public boolean debugCamEnable;
|
||||||
|
@ -278,8 +278,8 @@ public class Game implements IThreadListener {
|
||||||
public boolean tileOverlay;
|
public boolean tileOverlay;
|
||||||
public boolean itemCheat;
|
public boolean itemCheat;
|
||||||
public boolean dayCycle = true;
|
public boolean dayCycle = true;
|
||||||
public boolean showHud = true;
|
|
||||||
public boolean debugPlayer;
|
public boolean debugPlayer;
|
||||||
|
public boolean cameraUsed;
|
||||||
|
|
||||||
private int leftClickCounter;
|
private int leftClickCounter;
|
||||||
private int rightClickTimer;
|
private int rightClickTimer;
|
||||||
|
|
|
@ -148,14 +148,14 @@ public class GuiSkin extends GuiList<GuiSkin.SkinEntry>
|
||||||
// GuiSkin.this.gm.getTextureManager().bindTexture(tex);
|
// GuiSkin.this.gm.getTextureManager().bindTexture(tex);
|
||||||
GlState.enableBlend();
|
GlState.enableBlend();
|
||||||
GlState.enableDepth();
|
GlState.enableDepth();
|
||||||
boolean flag = GuiSkin.this.gm.showHud;
|
boolean flag = GuiSkin.this.gm.cameraUsed;
|
||||||
GuiSkin.this.gm.showHud = false;
|
GuiSkin.this.gm.cameraUsed = true;
|
||||||
EntityTexManager.altTexture = tex;
|
EntityTexManager.altTexture = tex;
|
||||||
EntityTexManager.altLayer = this.dynId;
|
EntityTexManager.altLayer = this.dynId;
|
||||||
EntityTexManager.altNpcLayer = this.dynId == -1 && this.charinfo != null ? this.charinfo.skin : null;
|
EntityTexManager.altNpcLayer = this.dynId == -1 && this.charinfo != null ? this.charinfo.skin : null;
|
||||||
drawEntity(x + 32, y + 60, 28.0f
|
drawEntity(x + 32, y + 60, 28.0f
|
||||||
/ GuiSkin.this.gm.thePlayer.getHeight(), -45.0f, -20.0f, GuiSkin.this.gm.thePlayer);
|
/ GuiSkin.this.gm.thePlayer.getHeight(), -45.0f, -20.0f, GuiSkin.this.gm.thePlayer);
|
||||||
GuiSkin.this.gm.showHud = flag;
|
GuiSkin.this.gm.cameraUsed = flag;
|
||||||
EntityTexManager.altTexture = null;
|
EntityTexManager.altTexture = null;
|
||||||
EntityTexManager.altLayer = -1;
|
EntityTexManager.altLayer = -1;
|
||||||
EntityTexManager.altNpcLayer = null;
|
EntityTexManager.altNpcLayer = null;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue