linting 3

This commit is contained in:
lewd-alt
2025-09-15 17:52:51 -07:00
parent bb3bf291e2
commit 459e9d04a6
21 changed files with 2207 additions and 3083 deletions

View File

@@ -34,14 +34,6 @@ namespace _2DGAMELIB
protected Vector2D p;
protected Rectangle r;
protected ColorMatrix cm = new ColorMatrix();
protected ImageAttributes ia = new ImageAttributes();
protected InterpolationMode im;
public Graphics GD => gd;
public Graphics GH => gh;

View File

@@ -47,6 +47,5 @@ namespace _2DGAMELIB
Pars.DrawH(hitUnit, gh);
}
}
}
}

View File

@@ -62,8 +62,6 @@ namespace _2DGAMELIB
public Par Frame1 => frame1;
public Par Frame2 => frame2;
public Par Gauge => gauge;
public Par Knob => knob;
@@ -288,7 +286,7 @@ namespace _2DGAMELIB
base_ = new Par
{
Tag = Name + "_ベース",
InitializeOP = new Out[1] { Shas.Get正方形() },
InitializeOP = new Out[1] { Shas.GetSquare() },
PositionBase = Position,
SizeBase = Size,
SizeXBase = Width,
@@ -302,7 +300,7 @@ namespace _2DGAMELIB
frame1 = new Par
{
Tag = Name + "_フレーム1",
InitializeOP = new Out[1] { Shas.Get正方形() },
InitializeOP = new Out[1] { Shas.GetSquare() },
PositionBase = Position,
SizeBase = Size,
SizeXBase = Width * GetWidthMag(),
@@ -317,7 +315,7 @@ namespace _2DGAMELIB
frame2 = new Par
{
Tag = Name + "_フレーム2",
InitializeOP = new Out[1] { Shas.Get正方形() },
InitializeOP = new Out[1] { Shas.GetSquare() },
PositionBase = Position,
SizeBase = Size,
SizeXBase = Width * GetWidthMag(),
@@ -331,7 +329,7 @@ namespace _2DGAMELIB
gauge = new Par
{
Tag = Name + "_ゲージ",
InitializeOP = new Out[1] { Shas.Get正方形() },
InitializeOP = new Out[1] { Shas.GetSquare() },
PositionBase = GetGaugePosition(),
SizeBase = Size,
SizeXBase = Width * GetWidthMag() * GetGaugeWidthMag(Margin),
@@ -345,7 +343,7 @@ namespace _2DGAMELIB
this.knob = new Par
{
Tag = Name + "_ブ",
InitializeOP = new Out[1] { Shas.Get正方形() },
InitializeOP = new Out[1] { Shas.GetSquare() },
SizeBase = Size,
SizeXBase = GetKnobWidthMag(Width),
SizeYBase = GetKnobHeightMag(Height),

View File

@@ -7,14 +7,10 @@ namespace _2DGAMELIB
{
private ParT parT;
private Med Med;
private Are Are;
private double Width;
private bool Input;
private double Min;
public ParT ParT => parT;
@@ -26,14 +22,10 @@ namespace _2DGAMELIB
return parT.Text;
}
set
{
//TODO fix?
//if (!Med.BaseControl.Contains(tb))
{
SetText(value);
}
}
}
private void SetText(string Text)
{
@@ -41,37 +33,38 @@ namespace _2DGAMELIB
SetRect();
}
public Lab(Med Med, Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor, bool Input)
public Lab(Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor)
{
//Note: Input is always false
Setting(Med, Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor, Input);
Setting(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor);
}
public Lab(Med Med, Are Are, string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor, bool Input)
public Lab(Are Are, string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor)
{
Setting(Med, Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor, Input);
Setting(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor);
}
private void Setting(Med Med, Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor, bool Input)
private void Setting(Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor)
{
this.Med = Med;
this.Are = Are;
this.Width = Width;
this.Input = Input;
Out[] array = new Out[1] { Shas.Get正方形() };
Out[] array = new Out[1] { Shas.GetSquare() };
if (FramColor == Color.Empty || FramColor == Color.Transparent)
{
array.OutlineFalse();
}
parT = new ParT
{
Tag = Name,
InitializeOP = array,
BasePointBase = array[0].ps[0],
PositionBase = Position,
SizeBase = Size,
Closed = true,
Tag = Name,
BrushColor = BackColor,
PenColor = FramColor,
Font = Font,
@@ -79,10 +72,13 @@ namespace _2DGAMELIB
TextColor = TextColor,
Text = "A"
};
if (ShadColor != Color.Empty)
{
parT.ShadBrush = new SolidBrush(ShadColor);
}
SetRect();
Min = parT.RectSize.Y;
SetText(Text);
@@ -111,6 +107,8 @@ namespace _2DGAMELIB
double x2 = Min + 0.07;
parT.RectSize = new Vector2D(x2, Min);
}
parT.OP[0].ps[0] = new Vector2D(0.0, 0.0);
parT.OP[0].ps[1] = new Vector2D(parT.RectSize.X, 0.0);
parT.OP[0].ps[2] = new Vector2D(parT.RectSize.X, parT.RectSize.Y);
@@ -120,11 +118,6 @@ namespace _2DGAMELIB
public void Dispose()
{
parT.Dispose();
if (Input)
{
//TODO fix?
//((Control)Med.BaseControl).Resize -= Lab_Resize;
}
}
}
}

View File

@@ -21,7 +21,7 @@ namespace _2DGAMELIB
public void Add(string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor, bool Input)
{
labs.Add(Name, new Lab(Med, Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor, Input));
labs.Add(Name, new Lab(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor));
}
public void Draw(Are Are)

View File

@@ -65,14 +65,6 @@ namespace _2DGAMELIB
Color.Black
};
private const int LOGPIXELSX = 88;
private const int LOGPIXELSY = 90;
public static double dpiX;
public static double dpiY;
public static double DpiX;
public static double DpiY;
@@ -83,12 +75,6 @@ namespace _2DGAMELIB
//public Control BaseControlC => baseControl;
public GlImage BaseControl => baseControl;
public double ResMag => resMag;
public Vector2D ResVector => resVector;
public string Mode
{
get
@@ -320,15 +306,18 @@ namespace _2DGAMELIB
{
baseControl.BitmapSetting(BD);
Modes[mode].Setting();
double FPS = 0.0;
Action action = delegate
{
FPS = FPSF.Value;
if (FPS > 1.0)
if (FPSF.Value > 1.0)
{
Modes[mode].Draw(FPSF);
if (ShowFPS)
{
baseControl.SetTitle(UITitle + " - FPS: " + System.Math.Round(FPSF.Value, 2));
}
}
GD.DrawImage(BH, new Point(0, 0));
@@ -339,11 +328,6 @@ namespace _2DGAMELIB
while (Drive)
{
FPSF.FPSFixed(action);
if (ShowFPS)
{
baseControl.SetTitle(UITitle + " - FPS: " + System.Math.Round(FPSF.Value, 2));
}
baseControl.PollEvents();
}
}
@@ -428,20 +412,6 @@ namespace _2DGAMELIB
}
}
public void Dispose()
{
Drive = false;
foreach (Module value in Modes.Values)
{
value.Dispose();
}
BD.Dispose();
GD.Dispose();
BH.Dispose();
GH.Dispose();
Sce.Dispose();
}
//[DllImport("user32.dll")]
//private static extern bool SetProcessDPIAware();

View File

@@ -19,6 +19,8 @@ namespace _2DGAMELIB
[NonSerialized, JsonIgnore]
private Brush brusht = new SolidBrush(Color.Black);
//unused
private const double Shift = 1.0;
[NonSerialized, JsonIgnore]
@@ -67,6 +69,7 @@ namespace _2DGAMELIB
private CharacterRange[] crr = new CharacterRange[1];
//unused
private CharacterRange[] cre = new CharacterRange[1];
public Font Font
@@ -171,19 +174,6 @@ namespace _2DGAMELIB
}
}
public Vector2D PositionT
{
get
{
return positionT;
}
set
{
positionT = value;
EditT = true;
}
}
public Vector2D RectSize
{
get
@@ -210,7 +200,6 @@ namespace _2DGAMELIB
{
}
public ParT(ParT ParT)
{
CopyT(ParT);

View File

@@ -5,85 +5,7 @@ namespace _2DGAMELIB
{
public static class Shas
{
public static readonly double D3 = 1.0 / 3.0;
public static readonly double D3_2 = 2.0 / 3.0;
public static Vector2D = Dat.Vec2DZero;
public static Vector2D = new Vector2D(0.5, 0.0);
public static Vector2D = new Vector2D(D3, 0.0);
public static Vector2D = new Vector2D(D3_2, 0.0);
public static Vector2D = new Vector2D(1.0, 0.0);
public static Vector2D = new Vector2D(0.0, 0.5);
public static Vector2D = new Vector2D(0.5, 0.5);
public static Vector2D = new Vector2D(D3, 0.5);
public static Vector2D = new Vector2D(D3_2, 0.5);
public static Vector2D = new Vector2D(1.0, 0.5);
public static Vector2D = new Vector2D(0.0, D3);
public static Vector2D = new Vector2D(0.5, D3);
public static Vector2D = new Vector2D(D3, D3);
public static Vector2D = new Vector2D(D3_2, D3);
public static Vector2D = new Vector2D(1.0, D3);
public static Vector2D = new Vector2D(0.0, D3_2);
public static Vector2D = new Vector2D(0.5, D3_2);
public static Vector2D = new Vector2D(D3, D3_2);
public static Vector2D = new Vector2D(D3_2, D3_2);
public static Vector2D = new Vector2D(1.0, D3_2);
public static Vector2D = new Vector2D(0.0, 1.0);
public static Vector2D = new Vector2D(0.5, 1.0);
public static Vector2D = new Vector2D(D3, 1.0);
public static Vector2D = new Vector2D(D3_2, 1.0);
public static Vector2D = Dat.Vec2DOne;
private static MatrixD m120 = 120.0.ToRadian().RotationZ();
private static MatrixD m240 = 240.0.ToRadian().RotationZ();
public static Vector2D TP1 = ;
public static Vector2D TP2 = GetTP2();
public static Vector2D TP3 = GetTP3();
public static Vector2D TP1_2 = (TP1 + TP2) * 0.5;
public static Vector2D TP2_3 = (TP2 + TP3) * 0.5;
public static Vector2D TP3_1 = (TP3 + TP1) * 0.5;
private static Vector2D GetTP2()
{
return Math.TransformCoordinateBP(ref TP1, ref , ref m120);
}
private static Vector2D GetTP3()
{
return Math.TransformCoordinateBP(ref TP1, ref , ref m240);
}
//rectangle coords
public static Vector2D MulX(this Vector2D Vector, double X)
{
@@ -97,13 +19,6 @@ namespace _2DGAMELIB
return Vector;
}
public static Vector2D MulXY(this Vector2D Vector, double X, double Y)
{
Vector.X *= X;
Vector.Y *= Y;
return Vector;
}
public static Vector2D AddX(this Vector2D Point, double X)
{
Point.X += X;
@@ -537,8 +452,18 @@ namespace _2DGAMELIB
}
}
public static Out Get三角形()
public static Out GetTriangle()
{
MatrixD m120 = 120.0.ToRadian().RotationZ();
MatrixD m240 = 240.0.ToRadian().RotationZ();
Vector2D TP1 = new Vector2D(0.5, 0.0);
Vector2D TP2 = Math.TransformCoordinateBP(TP1, new Vector2D(0.5, 0.5), m120);
Vector2D TP3 = Math.TransformCoordinateBP(TP1, new Vector2D(0.5, 0.5), m240);
return new Out
{
Tension = 0f,
@@ -546,12 +471,17 @@ namespace _2DGAMELIB
};
}
public static Out Get正方形()
public static Out GetSquare()
{
return new Out
{
Tension = 0f,
ps = { , , , }
ps = {
new Vector2D(0.0, 0.0),
new Vector2D(1.0, 0.0),
new Vector2D(1.0, 1.0),
new Vector2D(0.0, 1.0)
}
};
}
}

View File

@@ -204,7 +204,7 @@ namespace _2DGAMELIB
private void SetParT(string Name, ref Vector2D Position, double Size, double Width, double Height, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor)
{
pars = new Pars();
Out[] array = new Out[1] { Shas.Get正方形() };
Out[] array = new Out[1] { Shas.GetSquare() };
array.OutlineFalse();
parT = new ParT
{
@@ -231,7 +231,7 @@ namespace _2DGAMELIB
private void SetFeed(string Name, double Size, ref Color FeedColor)
{
Out[] array = new Out[1] { Shas.Get三角形() };
Out[] array = new Out[1] { Shas.GetTriangle() };
feed = new Par
{
Tag = Name + "_Feed",

View File

@@ -1,5 +1,6 @@
using System;
namespace _2DGAMELIB
{
[Serializable]

View File

@@ -46,6 +46,33 @@ namespace _2DGAMELIB
public static class Math
{
public static ulong overflow_add(this ulong u0, ulong u1)
{
checked
{
try
{
if (u0 + u1 > 9999999999999L)
{
return 9999999999999uL;
}
return u0 + u1;
}
catch
{
return 9999999999999uL;
}
}
}
public static ulong underflow_subtract(this ulong u0, ulong u1)
{
if (u0 < u1)
{
return 0uL;
}
return u0 - u1;
}
public static double RoundDown(this double Value, int Digits)
{
double num = System.Math.Pow(10.0, Digits);

View File

@@ -155,7 +155,7 @@ namespace SlaveMatrix
MaiB.BasePointBase = Dat.Vec2DZero;
MaiB.PositionBase = vector2D;
MaiB.SizeBase = num2;
MaiB.OP.AddRange(new Out[1] { Shas.Get正方形() });
MaiB.OP.AddRange(new Out[1] { Shas.GetSquare() });
MaiB.OP.ScalingX(MaiB.BasePointBase, num3);
MaiB.OP.ScalingY(MaiB.BasePointBase, num4);
MaiB.Closed = true;
@@ -174,7 +174,7 @@ namespace SlaveMatrix
Mai2B.BasePointBase = Dat.Vec2DZero;
Mai2B.PositionBase = new Vector2D(vector2D.X, 0.01);
Mai2B.SizeBase = num2;
Mai2B.OP.AddRange(new Out[1] { Shas.Get正方形() });
Mai2B.OP.AddRange(new Out[1] { Shas.GetSquare() });
Mai2B.OP.ScalingX(Mai2B.BasePointBase, num3);
Mai2B.OP.ScalingY(Mai2B.BasePointBase, num5);
Mai2B.Closed = true;
@@ -194,7 +194,7 @@ namespace SlaveMatrix
SubB.BasePointBase = Dat.Vec2DZero;
SubB.PositionBase = vector2D;
SubB.SizeBase = num2;
SubB.OP.AddRange(new Out[1] { Shas.Get正方形() });
SubB.OP.AddRange(new Out[1] { Shas.GetSquare() });
SubB.OP.ScalingX(SubB.BasePointBase, num3);
SubB.OP.ScalingY(SubB.BasePointBase, num4);
SubB.Closed = true;
@@ -204,13 +204,13 @@ namespace SlaveMatrix
Sub = new Tex("Tex4", vector2D, num2 * 1.01, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.07, 0, " ", Col.White, Col.Black, Color.Transparent, 15.0);
Sub.ParT.BasePointBase = Sub.ParT.OP.GetCenter().MulY(y);
Sub.Position = SubB.ToGlobal(SubB.JP[0].Joint);
SubInnfo_l = new Lab(Med, Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", Col.White, Col.Black, Color.FromArgb(160, Col.Black), Col.Empty, Input: false);
SubInnfo_l = new Lab(Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", Col.White, Col.Black, Color.FromArgb(160, Col.Black), Col.Empty);
SubInnfo_l.ParT.PositionBase = SubInnfo_l.ParT.PositionBase.AddY((0.0 - SubInnfo_l.ParT.OP[0].ps[3].Y) * SubInnfo_l.ParT.SizeBase);
Sub2B = new Par();
Sub2B.BasePointBase = Dat.Vec2DZero;
Sub2B.PositionBase = new Vector2D(0.0025, vector2D.Y);
Sub2B.SizeBase = num2;
Sub2B.OP.AddRange(new Out[1] { Shas.Get正方形() });
Sub2B.OP.AddRange(new Out[1] { Shas.GetSquare() });
Sub2B.OP.ScalingX(Sub2B.BasePointBase, num3);
Sub2B.OP.ScalingY(Sub2B.BasePointBase, num4);
Sub2B.Closed = true;

View File

@@ -2,13 +2,13 @@ using _2DGAMELIB;
namespace SlaveMatrix
{
public class
public class SlaveText
{
private Med Med;
private hd;
public (Med Med, hd)
public SlaveText(Med Med, hd)
{
this.Med = Med;
this.hd = hd;

View File

@@ -2,13 +2,13 @@ using _2DGAMELIB;
namespace SlaveMatrix
{
public class
public class ViolaText
{
private Med Med;
private hd;
public (Med Med, hd)
public ViolaText(Med Med, hd)
{
this.Med = Med;
this.hd = hd;

View File

@@ -1235,7 +1235,7 @@ namespace SlaveMatrix
X3Y5_膣口CP = new ColorP(X3Y5_膣口, CD, DisUnit, abj: true);
AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1);
AreM.Setting();
AreM.BasePoint = Shas.;
AreM.BasePoint = new Vector2D(0.5, 0.5);
AreMPos = AreM.GetPosition(ref AreM.BasePoint);
= e.;
Xi = 1;

View File

@@ -1235,7 +1235,7 @@ namespace SlaveMatrix
X3Y5_膣口CP = new ColorP(X3Y5_膣口, CD, DisUnit, abj: true);
AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1);
AreM.Setting();
AreM.BasePoint = Shas.;
AreM.BasePoint = new Vector2D(0.5, 0.5);
AreMPos = AreM.GetPosition(ref AreM.BasePoint);
= e.;
Xi = 1;

View File

@@ -5450,7 +5450,7 @@ namespace SlaveMatrix
nsb1 = .X0Y0_乳首.SizeBase;
nsb2 = .X0Y0_乳輪.SizeBase;
();
.B = Med.Base.GetPosition(ref Shas.);
.B = Med.Base.GetPosition(new Vector2D(0.5, 0.5));
Join();
Set腰();
if (.Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + s.Length + s.Length > 0)

View File

@@ -8,12 +8,6 @@ namespace SlaveMatrix
//race weighting/value information
public static class Def
{
public const double vd = 0.6;
public const double bd = 0.3;
public const double nd = 0.5;
public static Dictionary<string, RaceInformation> race_information = new Dictionary<string, RaceInformation>
{
{

File diff suppressed because it is too large Load Diff

View File

@@ -5,13 +5,10 @@ namespace SlaveMatrix
{
internal static class Program
{
public static bool biggerWindow;
[STAThread]
private static void Main(string[] A_0)
{
//Application.EnableVisualStyles();
//Application.SetCompatibleTextRenderingDefault(defaultValue: false);
Sta.LoadConfig();
@@ -19,7 +16,6 @@ namespace SlaveMatrix
if (Sta.BigWindow)
{
percent = 47.0;
biggerWindow = true;
}
Med med = new Med
@@ -33,21 +29,10 @@ namespace SlaveMatrix
};
med.InitializeModes("Start", Mods.GetMods);
UI uI = new UI(med);
//uI.Text = GameText.スレイブマトリクス;
//uI.Show();
//main loop
med.Drawing();
if (Mods.t1 != null)
{
Mods.t1.Wait();
}
med.Dispose();
Sta.Disposes();
}
}
}

View File

@@ -14,15 +14,11 @@ namespace SlaveMatrix
private ConstProp CP = new ConstProp();
public const double = 0.5;
public const double = 0.7;
public Med Med;
public Are Are;
public Unit Uni;
private Are Film;
public Cha Cha;
@@ -30,213 +26,136 @@ namespace SlaveMatrix
public InfoPanel ip;
//tools
public ;
public ;
public ;
public ;
public ;
public _コモン ;
public _ディル ;
public _アナル ;
public _デンマ ;
public _ドリル ;
public ;
public ;
public 調 調;
public T剃刀 T剃刀;
public 1 1;
public 1 2;
public 1 3;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM 調CM;
public CM T剃刀CM;
public CM 1CM;
public CM 2CM;
public CM 3CM;
private CM focus;
private CM hcm;
//tool animations?
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public 調 調;
public ;
public ;
public ;
public ;
private f;
public s;
private ef;
//ui elements
public But 調;
public But ;
public But ;
public But ;
public But ;
public But ;
public But ;
public But SlaveStamina;
public But PlayerStamina;
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
public Gau sゲージ;
public Gau sゲージ;
public Gau sゲージ;
public Gau mゲージ;
public Gau mゲージ;
public Gau mゲージ;
public Tex ;
public Tex InfoBox;
public Tex SensitivityBox;
//misc flags
public bool ;
public bool ;
public bool _;
private bool _;
public bool i肛f;
public bool f;
public bool oh;
public bool IsTB;
public bool ;
private bool IsTool;
private bool sf = true;
public bool ;
public bool bu;
public bool bu;
public ;
public Mot ;
public Mot ;
public Mots Mots = new Mots();
public Onomatopoeia ;
//moan queue :skull:
public Onomatopoeia ;
public Queue<Action<Are>> = new Queue<Action<Are>>();
private Are Film;
public bool _;
public bool ;
private CM focus;
private bool _;
//animation queue?
public List<> SubFocus = new List<>();
public bool i肛f;
public bool f;
public bool oh;
public bool IsTB;
private f;
public s;
public const double cs = 1.09;
public bool ;
private MouseButtons d;
private bool IsTool;
private CM hcm;
private ef;
private bool sf = true;
public bool ;
public bool bu;
public bool bu;
private MouseButtons HeldButton;
public double X;
public double Y;
public Tex InfoBox;
public Tex SensitivityBox;
public But SlaveStamina;
public But PlayerStamina;
public Color hc
{
@@ -468,6 +387,8 @@ namespace SlaveMatrix
}
}
public void (Vector2D p, string s, Color c, double d, bool b)
{
.Enqueue(delegate(Are a)
@@ -1697,7 +1618,7 @@ namespace SlaveMatrix
public void Move(ref MouseButtons mb, ref Vector2D cp, ref Vector2D op, ref Color hc, ref ContactD cd)
{
if (d != mb)
if (HeldButton != mb)
{
return;
}
@@ -1976,7 +1897,7 @@ namespace SlaveMatrix
public void Down(ref MouseButtons mb, ref Vector2D cp, ref Vector2D op, ref Color hc, ref ContactD cd)
{
if (d != 0)
if (HeldButton != 0)
{
return;
}
@@ -2050,12 +1971,12 @@ namespace SlaveMatrix
.Down(ref mb, ref cp, ref hc, ref cd);
調.Down(ref mb, ref cp, ref hc, ref cd);
SetIs膣i肛f();
d = mb;
HeldButton = mb;
}
public void Up(ref MouseButtons mb, ref Vector2D cp, ref Color hc, ref ContactD cd)
{
if (d == mb)
if (HeldButton == mb)
{
調.Up(ref hc);
.Up(ref hc);
@@ -2079,7 +2000,7 @@ namespace SlaveMatrix
.Up(ref mb, ref cp, ref hc);
.Up(ref mb, ref cp, ref hc, ref cd);
.Up(ref mb, ref cp, ref hc, ref cd);
d = MouseButtons.None;
HeldButton = MouseButtons.None;
}
}
@@ -2493,7 +2414,7 @@ namespace SlaveMatrix
= new But1(parT7, delegate
{
//Sounds.撮影.Play();
Med.();
Med.flash();
if (!Directory.Exists(Path))
{
Directory.CreateDirectory(Path);
@@ -2503,7 +2424,7 @@ namespace SlaveMatrix
Font font = new Font("MS Gothic", (float)(10.0 * Med.DpiY));
float x = 350f;
float y = 365f;
if (Program.biggerWindow)
if (Sta.BigWindow)
{
x = 525f;
y = 500f;
@@ -2679,7 +2600,6 @@ namespace SlaveMatrix
this.Cha. = null;
this.Cha.尿 = null;
}
Uni = Unit;
this.Cha = Cha;
Bod = Cha.Bod;
Bod. = this;
@@ -2792,7 +2712,7 @@ namespace SlaveMatrix
oh = false;
IsTB = false;
();
d = MouseButtons.None;
HeldButton = MouseButtons.None;
IsTool = false;
hcm = null;
ef = null;
@@ -3122,7 +3042,7 @@ namespace SlaveMatrix
{
double num = 0.31;
double width = 0.7;
if (Program.biggerWindow)
if (Sta.BigWindow)
{
num += 0.14;
}
@@ -3139,7 +3059,7 @@ namespace SlaveMatrix
{
double x = 0.08;
double y = 0.1;
if (Program.biggerWindow)
if (Sta.BigWindow)
{
x = 0.08;
y = 0.1;