Merge branch 'master' of github.com:sippeangelo/DepthsBelow
Conflicts: DepthsBelow/DepthsBelow/MouseInput.cs
This commit is contained in:
@@ -24,7 +24,8 @@ namespace DepthsBelow
|
|||||||
|
|
||||||
bool checkingDirection = false;
|
bool checkingDirection = false;
|
||||||
|
|
||||||
public MouseInput(Core core)
|
|
||||||
|
public MouseInput(Core core)
|
||||||
{
|
{
|
||||||
this.core = core;
|
this.core = core;
|
||||||
|
|
||||||
@@ -32,6 +33,7 @@ namespace DepthsBelow
|
|||||||
gridRectangle = Rectangle.Empty;
|
gridRectangle = Rectangle.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void LoadContent()
|
public void LoadContent()
|
||||||
{
|
{
|
||||||
selectionTexture = new Texture2D(core.GraphicsDevice, 1, 1);
|
selectionTexture = new Texture2D(core.GraphicsDevice, 1, 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user