mirror/StrawberryBF
1
0
Fork 0
mirror of https://github.com/MaddyThorson/StrawberryBF.git synced 2025-11-04 01:41:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to Beef 0.24.4

Browse Source
This commit is contained in:
Matt Thorson
2020-05-20 11:46:25 -07:00
parent 17fc10eb7c
commit 59a2eaaed6
5 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/Entity.bf
View File

@ -338,7 +338,7 @@ namespace Strawberry
public bool Check<T>() where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (Check(e))
return true;
@ -347,7 +347,7 @@ namespace Strawberry
public bool Check<T>(Point offset) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (Check(e, offset))
return true;
@ -356,7 +356,7 @@ namespace Strawberry
public bool CheckOutside<T>(Point offset) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (CheckOutside(e, offset))
return true;
@ -365,7 +365,7 @@ namespace Strawberry
public T First<T>() where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (Check(e))
return e;
@ -374,7 +374,7 @@ namespace Strawberry
public T First<T>(Point offset) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (Check(e, offset))
return e;
@ -383,7 +383,7 @@ namespace Strawberry
public T FirstOutside<T>(Point offset) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (CheckOutside(e, offset))
return e;
@ -392,7 +392,7 @@ namespace Strawberry
public List<T> All<T>(List<T> into) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (Check(e))
into.Add(e);
@ -401,7 +401,7 @@ namespace Strawberry
public List<T> All<T>(Point offset, List<T> into) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (Check(e, offset))
into.Add(e);
@ -410,7 +410,7 @@ namespace Strawberry
public List<T> AllOutside<T>(Point offset, List<T> into) where T : Entity
{
for (var e in Scene.All<T>(scope List<T>))
for (var e in Scene.All<T>(scope List<T>()))
if (CheckOutside(e, offset))
into.Add(e);

29
src/Physics/Actor.bf
View File

@ -43,7 +43,7 @@ namespace Strawberry
MovedByGeometry = Point.Zero;
}
public bool MoveX(float amount, Action<Collision> onCollide = null)
public bool MoveX(float amount, delegate void(Collision) onCollide = null)
{
remainder.X += amount;
let move = (int)Math.Round(remainder.X);
@ -56,7 +56,7 @@ namespace Strawberry
return false;
}
public bool MoveY(float amount, Action<Collision> onCollide = null)
public bool MoveY(float amount, delegate void(Collision) onCollide = null)
{
remainder.Y += amount;
let move = (int)Math.Round(remainder.Y);
@ -72,16 +72,16 @@ namespace Strawberry
[Inline]
public void MoveToX(float x)
{
MoveX(x - (X + remainder.X));
MoveX(x - (X + remainder.X), null);
}
[Inline]
public void MoveToY(float y)
{
MoveY(y - (Y + remainder.Y));
MoveY(y - (Y + remainder.Y), null);
}
public bool MoveExactX(int amount, Action<Collision> onCollide = null, Geometry pusher = null, Geometry carrier = null)
public bool MoveExactX(int amount, delegate void(Collision) onCollide = null, Geometry pusher = null, Geometry carrier = null)
{
int move = amount;
int sign = Math.Sign(amount);
@ -127,7 +127,7 @@ namespace Strawberry
return false;
}
public bool MoveExactY(int amount, Action<Collision> onCollide = null, Geometry pusher = null, Geometry carrier = null)
public bool MoveExactY(int amount, delegate void(Collision) onCollide = null, Geometry pusher = null, Geometry carrier = null)
{
int move = amount;
int sign = Math.Sign(amount);
@ -195,5 +195,22 @@ namespace Strawberry
{
MovedByGeometry += amount;
}
public bool CornerCorrection(Cardinals direction, int maxAmount, int lookAhead = 1, int onlySign = 0)
{
Point pt = direction;
if (pt.X != 0)
{
}
else
{
}
return false;
}
}
}

8
src/Physics/JumpThru.bf
View File

@ -20,7 +20,7 @@ namespace Strawberry
{
if (Collidable)
{
let riders = GetRiders(scope List<Actor>);
let riders = GetRiders(scope List<Actor>());
X += amount;
for (var a in riders)
@ -34,11 +34,11 @@ namespace Strawberry
{
if (Collidable)
{
let riders = GetRiders(scope List<Actor>);
let riders = GetRiders(scope List<Actor>());
if (amount < 0)
{
for (var a in Scene.All<Actor>(scope List<Actor>))
for (var a in Scene.All<Actor>(scope List<Actor>()))
{
if (riders.Contains(a) || CheckOutside(a, Point.UnitY * amount))
{
@ -65,7 +65,7 @@ namespace Strawberry
public override List<Actor> GetRiders(List<Actor> into)
{
for (var a in Scene.All<Actor>(scope List<Actor>))
for (var a in Scene.All<Actor>(scope List<Actor>()))
if (a.IsRiding(this))
into.Add(a);
return into;

10
src/Physics/Solid.bf
View File

@ -12,7 +12,7 @@ namespace Strawberry
public override List<Actor> GetRiders(List<Actor> into)
{
for (var a in Scene.All<Actor>(scope List<Actor>))
for (var a in Scene.All<Actor>(scope List<Actor>()))
if (a.IsRiding(this))
into.Add(a);
return into;
@ -22,12 +22,12 @@ namespace Strawberry
{
if (Collidable)
{
let riders = GetRiders(scope List<Actor>);
let riders = GetRiders(scope List<Actor>());
X += amount;
Collidable = false;
for (Actor a in Scene.All<Actor>(scope List<Actor>))
for (Actor a in Scene.All<Actor>(scope List<Actor>()))
{
if (Check(a))
{
@ -56,12 +56,12 @@ namespace Strawberry
{
if (Collidable)
{
let riders = GetRiders(scope List<Actor>);
let riders = GetRiders(scope List<Actor>());
Y += amount;
Collidable = false;
for (Actor a in Scene.All<Actor>(scope List<Actor>))
for (Actor a in Scene.All<Actor>(scope List<Actor>()))
{
if (Check(a))
{

2
src/Static/Calc.bf
View File

@ -49,7 +49,7 @@ namespace Strawberry
[Inline]
static public void Log<T>(T v)
{
String string = scope String;
String string = scope String();
v.ToString(string);
Debug.WriteLine(string);
}