Merge pull request #1281 from Areloch/issue1257

Fix for issue #1257
This commit is contained in:
Daniel Buckmaster 2015-07-01 22:47:27 +10:00
commit f0333aabfd
4 changed files with 58 additions and 10 deletions

View file

@ -99,6 +99,27 @@ function MissionAreaEditorPlugin::onDeactivated( %this )
Parent::onDeactivated(%this);
}
function MissionAreaEditorPlugin::setEditorFunction( %this )
{
%missionAreaExists = isObject(getMissionAreaServerObject());
if( %missionAreaExists == false )
MessageBoxYesNoCancel("No Mission Area","Would you like to create a New Mission Area?", "MissionAreaEditorPlugin.createNewMissionArea();");
return %missionAreaExists;
}
function MissionAreaEditorPlugin::createNewMissionArea(%this)
{
%newMissionArea = new MissionArea();
%newMissionArea.area = "-256 -256 512 512";
MissionGroup.add(%newMissionArea);
EditorGui.setEditor(MissionAreaEditorPlugin);
EWorldEditor.isDirty = true;
}
//-----------------------------------------------------------------------------
// Settings
//-----------------------------------------------------------------------------

View file

@ -25,11 +25,14 @@ function MissionAreaEditorGui::onEditorActivated( %this )
EWorldEditor.clearSelection();
%ma = getMissionAreaServerObject();
EWorldEditor.selectObject( %ma );
EWorldEditor.syncGui();
MissionAreaEditorTerrainEditor.updateTerrain();
%this.setSelectedMissionArea( %ma );
%this.onMissionAreaSelected( %this.getSelectedMissionArea() );
if( isObject( %ma ) )
{
EWorldEditor.selectObject( %ma );
EWorldEditor.syncGui();
MissionAreaEditorTerrainEditor.updateTerrain();
%this.setSelectedMissionArea( %ma );
%this.onMissionAreaSelected( %this.getSelectedMissionArea() );
}
}
function MissionAreaEditorGui::onEditorDeactivated( %this )

View file

@ -99,6 +99,27 @@ function MissionAreaEditorPlugin::onDeactivated( %this )
Parent::onDeactivated(%this);
}
function MissionAreaEditorPlugin::setEditorFunction( %this )
{
%missionAreaExists = isObject(getMissionAreaServerObject());
if( %missionAreaExists == false )
MessageBoxYesNoCancel("No Mission Area","Would you like to create a New Mission Area?", "MissionAreaEditorPlugin.createNewMissionArea();");
return %missionAreaExists;
}
function MissionAreaEditorPlugin::createNewMissionArea(%this)
{
%newMissionArea = new MissionArea();
%newMissionArea.area = "-256 -256 512 512";
MissionGroup.add(%newMissionArea);
EditorGui.setEditor(MissionAreaEditorPlugin);
EWorldEditor.isDirty = true;
}
//-----------------------------------------------------------------------------
// Settings
//-----------------------------------------------------------------------------

View file

@ -25,11 +25,14 @@ function MissionAreaEditorGui::onEditorActivated( %this )
EWorldEditor.clearSelection();
%ma = getMissionAreaServerObject();
EWorldEditor.selectObject( %ma );
EWorldEditor.syncGui();
MissionAreaEditorTerrainEditor.updateTerrain();
%this.setSelectedMissionArea( %ma );
%this.onMissionAreaSelected( %this.getSelectedMissionArea() );
if( isObject( %ma ) )
{
EWorldEditor.selectObject( %ma );
EWorldEditor.syncGui();
MissionAreaEditorTerrainEditor.updateTerrain();
%this.setSelectedMissionArea( %ma );
%this.onMissionAreaSelected( %this.getSelectedMissionArea() );
}
}
function MissionAreaEditorGui::onEditorDeactivated( %this )