Skip to content

Commit

Permalink
Quick code check.
Browse files Browse the repository at this point in the history
  • Loading branch information
acaly committed Oct 17, 2017
1 parent 9e34b88 commit 69c532b
Show file tree
Hide file tree
Showing 13 changed files with 182 additions and 269 deletions.
4 changes: 2 additions & 2 deletions Editor/Editable/EnumDisplayNameEnumConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

namespace GS_PatEditor.Editor.Editable
{
class EnumDisplayNameEnumConverterEnumConverter : EnumConverter
class EnumDisplayNameEnumConverter : EnumConverter
{
private Type enumType;

public EnumDisplayNameEnumConverterEnumConverter(Type type)
public EnumDisplayNameEnumConverter(Type type)
: base(type)
{
enumType = type;
Expand Down
17 changes: 0 additions & 17 deletions Editor/Editor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -246,23 +246,6 @@ public void ShowActionEditForm()
{
if (CurrentAction != null)
{
//if (CurrentAction.ContainsLowLevelEffects)
//{
// //advanced mode
// if (CurrentAction.Behaviors.Count > 0)
// {
// MessageBox.Show("Advanced mode. Behaviors is neglated. " +
// "Remove all the effects to edit behaviors.");
// }
// var dialog = new ActionEditForm(Project, CurrentAction);
// dialog.ShowDialog();
//}
//else
//{
// //normal mode
// var dialog = new ActionBehaviorEditForm(Project, CurrentAction);
// dialog.ShowDialog();
//}
var dialog = new ActionBehaviorEditForm(Project, CurrentAction);
dialog.ShowDialog();
}
Expand Down
2 changes: 1 addition & 1 deletion Editor/Exporters/Player/PlayerExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public override void Export(Pat.Project proj)
this.GenEnv = SkillGenerator.CreateEnv(this, playerScript);
SkillGenerator.GenerateSkills(this, playerScript);
SkillGenerator.GenerateAliasAssignment(this);
this.GenEnv = null;
this.GenEnv = null; //TODO handle exception

SkillGenerator.GenerateStartMotionFunction(_SSERecorder, playerScript);

Expand Down
31 changes: 0 additions & 31 deletions Editor/Exporters/Player/Skill.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,6 @@

namespace GS_PatEditor.Editor.Exporters.Player
{
//[EditorSelector(typeof(Skill))]
//class SelectEffect : Skill, IHideFromEditor, IEditableEnvironment
//{
// private readonly Action<Skill> _OnNewSkill;

// public SelectEffect(Action<Skill> onNewSkill)
// {
// _OnNewSkill = onNewSkill;
// }

// [TypeConverter(typeof(GenericEditorSelectorTypeConverter<Skill>))]
// public SelectType Type
// {
// get
// {
// return null;
// }
// set
// {
// if (value == null || value.Value == null)
// {
// return;
// }
// _OnNewSkill(SelectHelper.Create<Skill>(value.Value, Environment));
// }
// }

// [Browsable(false)]
// public EditableEnvironment Environment { get; set; }
//}

public enum SkillKey
{
KeyA,
Expand Down
9 changes: 5 additions & 4 deletions Editor/Exporters/PostExportScriptForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 69c532b

Please sign in to comment.