Skip to content

Commit 9745aa7

Browse files
Orden4Orden4
committed
Merge branch 'master' into release/3.3.0
2 parents f1e51c7 + 9d92b21 commit 9745aa7

6 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎WCSharp.Api/Legacy/startlocprio.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ internal startlocprio()
88
}
99

1010
/// @CSharpLua.Get = "MAP_LOC_PRIO_LOW"
11-
public static extern textaligntype Low { get; }
11+
public static extern startlocprio Low { get; }
1212
/// @CSharpLua.Get = "MAP_LOC_PRIO_HIGH"
13-
public static extern textaligntype High { get; }
13+
public static extern startlocprio High { get; }
1414
/// @CSharpLua.Get = "MAP_LOC_PRIO_NOT"
15-
public static extern textaligntype Not { get; }
15+
public static extern startlocprio Not { get; }
1616

1717
/// @CSharpLua.Template = "ConvertStartLocPrio({0})"
1818
public static extern startlocprio Convert(int startLocPrioId);

‎WCSharp.Api/destructable.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ internal destructable()
2626
/// @CSharpLua.Template = "BlzCreateDeadDestructableZWithSkin({0}, {1}, {2}, {3}, {5}, {6}, {7}, {4})"
2727
public static extern destructable CreateDeadZWithSkin(int typeId, float x, float y, float z, int skin, float facing = Blizzard.bj_UNIT_FACING, float scale = 1.0f, int variation = 0);
2828

29-
/// @CSharpLua.Get = "GetWidgetX({this})"
30-
public extern float X { get; }
31-
32-
/// @CSharpLua.Get = "GetWidgetY({this})"
33-
public extern float Y { get; }
34-
3529
/// @CSharpLua.Get = "GetDestructableMaxLife({this})"
3630
/// @CSharpLua.Set = "SetDestructableMaxLife({this}, {0})"
3731
public extern float MaxLife { get; set; }

‎WCSharp.Api/item.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ internal item()
2929
/// @CSharpLua.Get = "GetItemType({this})"
3030
public extern itemtype Type { get; }
3131

32-
/// @CSharpLua.Get = "GetWidgetX({this})"
33-
/// @CSharpLua.Set = "SetItemPosition({this}, GetWidgetY({this}))"
34-
public extern float X { get; set; }
32+
/// @CSharpLua.Get = "GetItemX({this})"
33+
/// @CSharpLua.Set = "SetItemPosition({this}, {0}, GetItemY({this}))"
34+
public extern new float X { get; set; }
3535

36-
/// @CSharpLua.Get = "GetWidgetY({this})"
37-
/// @CSharpLua.Set = "SetItemPosition(GetWidgetX({this}), {this})"
38-
public extern float Y { get; set; }
36+
/// @CSharpLua.Get = "GetItemY({this})"
37+
/// @CSharpLua.Set = "SetItemPosition({this}, GetItemX({this}), {0})"
38+
public extern new float Y { get; set; }
3939

4040
/// @CSharpLua.Get = "GetItemPlayer({this})"
4141
/// @CSharpLua.Set = "SetItemPlayer({this}, {0}, true)"

‎WCSharp.Api/texmapflags.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ internal texmapflags()
88
}
99

1010
/// @CSharpLua.Get = "TEXMAP_FLAG_NONE"
11-
public static extern subanimtype None { get; }
11+
public static extern texmapflags None { get; }
1212
/// @CSharpLua.Get = "TEXMAP_FLAG_WRAP_U"
13-
public static extern subanimtype WrapU { get; }
13+
public static extern texmapflags WrapU { get; }
1414
/// @CSharpLua.Get = "TEXMAP_FLAG_WRAP_V"
15-
public static extern subanimtype WrapV { get; }
15+
public static extern texmapflags WrapV { get; }
1616
/// @CSharpLua.Get = "TEXMAP_FLAG_WRAP_UV"
17-
public static extern subanimtype WrapUV { get; }
17+
public static extern texmapflags WrapUV { get; }
1818

1919
/// @CSharpLua.Template = "ConvertTexMapFlags({0})"
2020
public static extern texmapflags Convert(int textMapFlagsId);

‎WCSharp.Api/unit.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal unit()
2525
public static extern int FoodMadeBy(int unitType);
2626
/// @CSharpLua.Template = "GetUnitGoldCost({0})"
2727
public static extern int GoldCostOf(int unitType);
28-
/// @CSharpLua.Template = "GetUnitGoldCost({0})"
28+
/// @CSharpLua.Template = "GetUnitWoodCost({0})"
2929
public static extern int WoodCostOf(int unitType);
3030
/// @CSharpLua.Template = "GetUnitBuildTime({0})"
3131
public static extern int BuildTimeOf(int unitType);
@@ -37,18 +37,18 @@ internal unit()
3737
public static extern bool IsUnitType(int unitTypeId, unittype unitType);
3838

3939
/// @CSharpLua.Get = "GetUnitGoldCost(GetUnitTypeId({this}))"
40-
public static extern int GoldCost { get; }
41-
/// @CSharpLua.Get = "GetUnitGoldCost(GetUnitTypeId({this}))"
42-
public static extern int WoodCost { get; }
40+
public extern int GoldCost { get; }
41+
/// @CSharpLua.Get = "GetUnitWoodCost(GetUnitTypeId({this}))"
42+
public extern int WoodCost { get; }
4343
/// @CSharpLua.Get = "GetUnitBuildTime(GetUnitTypeId({this}))"
44-
public static extern int BuildTime { get; }
44+
public extern int BuildTime { get; }
4545

4646
/// @CSharpLua.Get = "GetUnitX({this})"
4747
/// @CSharpLua.Set = "SetUnitX({this}, {0})"
48-
public extern float X { get; set; }
48+
public extern new float X { get; set; }
4949
/// @CSharpLua.Get = "GetUnitY({this})"
5050
/// @CSharpLua.Set = "SetUnitY({this}, {0})"
51-
public extern float Y { get; set; }
51+
public extern new float Y { get; set; }
5252
/// @CSharpLua.Get = "GetUnitState({this}, UNIT_STATE_MANA)"
5353
/// @CSharpLua.Set = "SetUnitState({this}, UNIT_STATE_MANA, {0})"
5454
public extern float Mana { get; set; }
@@ -149,7 +149,7 @@ internal unit()
149149
/// @CSharpLua.Set = "SetUnitPropWindow({this}, {0})"
150150
public extern float PropWindow { get; set; }
151151
/// @CSharpLua.Get = "GetUnitAcquireRange({this})"
152-
/// @CSharpLua.Get = "SetUnitAcquireRange({this}, {0})"
152+
/// @CSharpLua.Set = "SetUnitAcquireRange({this}, {0})"
153153
public extern float AcquireRange { get; set; }
154154
/// @CSharpLua.Get = "GetUnitFlyHeight({this})"
155155
/// @CSharpLua.Set = "SetUnitFlyHeight({this}, {0}, 0)"
@@ -390,7 +390,7 @@ internal unit()
390390
/// @CSharpLua.Template = "UnitMakeAbilityPermanent({this}, {1}, {0})"
391391
public extern bool SetAbilityPermanent(int abilityId, bool permanent);
392392
/// @CSharpLua.Template = "BlzDeleteHeroAbility({this}, {0})"
393-
public extern bool DeleteHeroAbility(int abilityId);
393+
public extern void DeleteHeroAbility(int abilityId);
394394

395395
/// @CSharpLua.Template = "UnitRemoveBuffs({this}, {0}, {1})"
396396
public extern void RemoveBuffs(bool positive, bool negative);
@@ -809,7 +809,7 @@ internal unit()
809809
public extern bool AttackEnabled1 { get; set; }
810810

811811
/// @CSharpLua.Get = "BlzGetUnitWeaponIntegerField({this}, UNIT_WEAPON_IF_ATTACK_MAXIMUM_NUMBER_OF_TARGETS, 0)"
812-
/// @CSharpLua.Set = "BlzSetUnitWeaponBooleanField({this}, UNIT_WEAPON_IF_ATTACK_MAXIMUM_NUMBER_OF_TARGETS, 0, {0})"
812+
/// @CSharpLua.Set = "BlzSetUnitWeaponIntegerField({this}, UNIT_WEAPON_IF_ATTACK_MAXIMUM_NUMBER_OF_TARGETS, 0, {0})"
813813
public extern int AttackMaximumNumberOfTargets1 { get; set; }
814814

815815
/// @CSharpLua.Get = "BlzGetUnitWeaponIntegerField({this}, UNIT_WEAPON_IF_ATTACK_ATTACK_TYPE, 0)"

‎WCSharp.Api/widget.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ internal widget()
77
{
88
}
99

10+
/// @CSharpLua.Get = "GetWidgetX({this})"
11+
public extern float X { get; }
12+
13+
/// @CSharpLua.Get = "GetWidgetY({this})"
14+
public extern float Y { get; }
15+
1016
/// @CSharpLua.Get = "GetWidgetLife({this})"
1117
/// @CSharpLua.Set = "SetWidgetLife({this}, {0})"
1218
public extern float Life { get; set; }

0 commit comments

Comments
 (0)