Adapted to changes in GDCore.

Small changes.

git-svn-id: svn://localhost@786 8062f311-0dae-4547-b526-b8ab9ac864a5
This commit is contained in:
Florian
2012-07-15 10:42:38 +00:00
parent 2825faa5e1
commit bb51b35846
17 changed files with 703 additions and 485 deletions
+3 -3
View File
@@ -22,7 +22,7 @@
#include "GDL/RuntimeGame.h"
#include "GDL/Object.h"
#include "GDL/ObjectHelpers.h"
#include "GDL/IDE/Dialogs/ChooseObject.h"
#include "GDCore/IDE/Dialogs/ChooseObjectDialog.h"
#include "GDL/IDE/Dialogs/ChooseLayer.h"
#include "ConsoleManager.h"
@@ -736,10 +736,10 @@ void DebuggerGUI::OnAddVarGlobalBtClick( wxCommandEvent & event )
void DebuggerGUI::OnAddObjBtClick( wxCommandEvent & event )
{
ChooseObject dialog( this, *scene.game, scene, false );
gd::ChooseObjectDialog dialog( this, *scene.game, scene, false );
if ( dialog.ShowModal() != 1 ) return;
string objectWanted = dialog.objectChosen;
string objectWanted = dialog.GetChosenObject();
std::vector<ObjSPtr>::iterator sceneObject = std::find_if(scene.GetInitialObjects().begin(), scene.GetInitialObjects().end(), std::bind2nd(ObjectHasName(), objectWanted));
std::vector<ObjSPtr>::iterator globalObject = std::find_if(scene.game->GetGlobalObjects().begin(), scene.game->GetGlobalObjects().end(), std::bind2nd(ObjectHasName(), objectWanted));