Skip to content

Commit

Permalink
getting rid of compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
RekkasGit committed Nov 24, 2024
1 parent 218a7f6 commit 971482a
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 44 deletions.
2 changes: 1 addition & 1 deletion E3Next/Data/SpellRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public SpellRequest(string spellName, IniData parsedData = null):base(spellName,
{

}
public static new SpellRequest FromProto(SpellData source)
public static SpellRequest FromProto(SpellData source)
{
SpellRequest r = new SpellRequest();
r.AfterEvent = source.AfterEvent;
Expand Down
44 changes: 22 additions & 22 deletions E3Next/Processors/Basics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -331,28 +331,28 @@ public static void RegisterEvents()
//coth, or summoned by a mob?
///a Tae Ew warder says 'You will not evade me, Alara!'
///You have been summoned!
if (Assist.AllowControl) return; //this is our driver and most likely a tank, ignore this.

_spawns.RefreshList();//make sure we get a new refresh of this zone.
//check to see if your target is on top of you, if so... well, good luck!
Int32 targetID = MQ.Query<Int32>("${Target.ID}");
if(_spawns.TryByID(targetID, out var spawn))
{
if(spawn.Distance<5 && spawn.Aggressive && spawn.TypeDesc=="NPC")
{
//oh dear, the mob is in your face, best of luck.
if(Movement.AnchorTarget>0)
{
Movement.MoveToAnchor();
}
}
else
{
//you have been cothed, reset stuff
Movement.Reset();
Assist.Reset();
}
}
//if (Assist.AllowControl) return; //this is our driver and most likely a tank, ignore this.

// _spawns.RefreshList();//make sure we get a new refresh of this zone.
// //check to see if your target is on top of you, if so... well, good luck!
// Int32 targetID = MQ.Query<Int32>("${Target.ID}");
// if(_spawns.TryByID(targetID, out var spawn))
// {
// if(spawn.Distance<5 && spawn.Aggressive && spawn.TypeDesc=="NPC")
// {
// //oh dear, the mob is in your face, best of luck.
// if(Movement.AnchorTarget>0)
// {
// Movement.MoveToAnchor();
// }
// }
// else
// {
// //you have been cothed, reset stuff
// Movement.Reset();
// Assist.Reset();
// }
// }
});
//
EventProcessor.RegisterEvent("AskedForRaidInvite", "(.+) tells you, 'raidadd'", (x) =>
Expand Down
9 changes: 1 addition & 8 deletions E3Next/Processors/BuffCheck.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1455,14 +1455,7 @@ private static void BuffAuras()
string currentAura = MQ.Query<string>("${Me.Aura[1]}");
if (currentAura != "NULL")
{
//we already have an aura, check if its different
//if (currentAura.Equals(_selectAura.SpellName, StringComparison.OrdinalIgnoreCase))
{
//don't need to do anything
return;
}
//else remove it as we are putting on something else.
MQ.Cmd($"/removeaura {currentAura}");
return;
}

//need to put on new aura
Expand Down
1 change: 0 additions & 1 deletion E3Next/Processors/Zoning.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ private static void InitZoneLookup()


}
private static Int32 _recordingMaxDelta = 10;
[ClassInvoke(Class.All)]
public static void RecordZoneData()
{
Expand Down
2 changes: 1 addition & 1 deletion E3Next/Resources/BuildDate.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sat 11/23/2024 21:03:31.78
Sun 11/24/2024 14:33:23.27
1 change: 0 additions & 1 deletion E3Next/Settings/FeatureSettings/LootStackable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace E3Core.Settings.FeatureSettings
{
public class LootStackable : BaseSettings
{
IniData _stackableAlwaysLootData;
string _fileName;
public IniData parsedData;
public HashSet<string> AlwaysStackableItems = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
Expand Down
6 changes: 1 addition & 5 deletions E3Next/Utility/e3util.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,7 @@ public static void TryMoveToTarget()

e3util.NavToSpawnID(targetID);
return;
//exit from TryMoveToTarget if we've reached the target
if (MQ.Query<Double>("${Target.Distance}") < E3.GeneralSettings.Movement_NavStopDistance)
{
return;
}

}
}

Expand Down
9 changes: 5 additions & 4 deletions E3NextUI/E3UI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,11 @@ private const int
HTBOTTOMLEFT = 16,
HTBOTTOMRIGHT = 17;
const int _ = 10; // you can rename this variable if you like
Rectangle Top { get { return new Rectangle(0, 0, this.ClientSize.Width, _); } }
Rectangle Left { get { return new Rectangle(0, 0, _, this.ClientSize.Height); } }
Rectangle Bottom { get { return new Rectangle(0, this.ClientSize.Height - _, this.ClientSize.Width, _); } }
Rectangle Right { get { return new Rectangle(this.ClientSize.Width - _, 0, _, this.ClientSize.Height); } }

new Rectangle Top { get { return new Rectangle(0, 0, this.ClientSize.Width, _); } }
new Rectangle Left { get { return new Rectangle(0, 0, _, this.ClientSize.Height); } }
new Rectangle Bottom { get { return new Rectangle(0, this.ClientSize.Height - _, this.ClientSize.Width, _); } }
new Rectangle Right { get { return new Rectangle(this.ClientSize.Width - _, 0, _, this.ClientSize.Height); } }

Rectangle TopLeft { get { return new Rectangle(0, 0, _, _); } }
Rectangle TopRight { get { return new Rectangle(this.ClientSize.Width - _, 0, _, _); } }
Expand Down
2 changes: 1 addition & 1 deletion E3NextUI/Util/GlobalKeyboard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class globalKeyboardHook
/// defines the callback type for the hook
/// </summary>
public delegate int keyboardHookProc(int code, int wParam, ref keyboardHookStruct lParam);
public event EventHandler<KeyEventArgs> KeyboardPressed;
//public event EventHandler<KeyEventArgs> KeyboardPressed;
private static keyboardHookProc _functionProc;
public struct keyboardHookStruct
{
Expand Down

0 comments on commit 971482a

Please sign in to comment.