phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes some unused variables in Atlas

Browse Source 
This was SVN commit r15746.
This commit is contained in:
historic_bruno 2014-09-13 19:34:04 +00:00
parent 01395ce96d
commit 60d92b643d
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2014 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -100,7 +100,6 @@ private:
std::set<std::wstring> m_MapSettingsKeywords;
std::vector<wxChoice*> m_PlayerCivChoices;
ScenarioEditor& m_ScenarioEditor;
Observable<AtObj>& m_MapSettings;
DECLARE_EVENT_TABLE();
@ -115,7 +114,7 @@ BEGIN_EVENT_TABLE(MapSettingsControl, wxPanel)
END_EVENT_TABLE();
MapSettingsControl::MapSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor)
: wxPanel(parent, wxID_ANY), m_ScenarioEditor(scenarioEditor), m_MapSettings(scenarioEditor.GetMapSettings())
: wxPanel(parent, wxID_ANY), m_MapSettings(scenarioEditor.GetMapSettings())
{
wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Map settings"));
SetSizer(sizer);

8
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2014 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -64,7 +64,6 @@ class ObjectBottomBar : public wxPanel
public:
ObjectBottomBar(
wxWindow* parent,
ScenarioEditor& scenarioEditor,
Observable<ObjectSettings>& objectSettings,
Observable<AtObj>& mapSettings,
ObjectSidebarImpl* p
@ -91,7 +90,6 @@ private:
wxPanel* m_ViewerPanel;
ObjectSidebarImpl* p;
ScenarioEditor& m_ScenarioEditor;
DECLARE_EVENT_TABLE();
};
@ -166,7 +164,6 @@ ObjectSidebar::ObjectSidebar(
m_BottomBar = new ObjectBottomBar(
bottomBarContainer,
scenarioEditor,
scenarioEditor.GetObjectSettings(),
scenarioEditor.GetMapSettings(),
p
@ -362,12 +359,11 @@ END_EVENT_TABLE();
ObjectBottomBar::ObjectBottomBar(
wxWindow* parent,
ScenarioEditor& scenarioEditor,
Observable<ObjectSettings>& objectSettings,
Observable<AtObj>& mapSettings,
ObjectSidebarImpl* p
)
: wxPanel(parent, wxID_ANY), p(p), m_ScenarioEditor(scenarioEditor)
: wxPanel(parent, wxID_ANY), p(p)
{
m_ViewerWireframe = false;
m_ViewerMove = false;

20
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Wildfire Games.
/* Copyright (C) 2014 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -100,8 +100,8 @@ class PlayerNotebookPage : public wxPanel
{
public:
PlayerNotebookPage(ScenarioEditor& scenarioEditor, wxWindow* parent, const wxString& name, size_t playerID)
: wxPanel(parent, wxID_ANY), m_ScenarioEditor(scenarioEditor), m_Name(name), m_PlayerID(playerID)
PlayerNotebookPage(wxWindow* parent, const wxString& name, size_t playerID)
: wxPanel(parent, wxID_ANY), m_Name(name), m_PlayerID(playerID)
{
m_Controls.page = this;
@ -328,7 +328,6 @@ private:
bool m_CameraDefined;
wxString m_Name;
size_t m_PlayerID;
ScenarioEditor& m_ScenarioEditor;
PlayerPageControls m_Controls;
@ -347,15 +346,14 @@ END_EVENT_TABLE();
class PlayerNotebook : public wxChoicebook
{
public:
PlayerNotebook(ScenarioEditor& scenarioEditor, wxWindow *parent)
: wxChoicebook(parent, wxID_ANY/*, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH*/),
m_ScenarioEditor(scenarioEditor)
PlayerNotebook(wxWindow *parent)
: wxChoicebook(parent, wxID_ANY/*, wxDefaultPosition, wxDefaultSize, wxNB_FIXEDWIDTH*/)
{
}
PlayerPageControls AddPlayer(wxString name, size_t player)
{
PlayerNotebookPage* playerPage = new PlayerNotebookPage(m_ScenarioEditor, this, name, player);
PlayerNotebookPage* playerPage = new PlayerNotebookPage(this, name, player);
AddPage(playerPage, name);
m_Pages.push_back(playerPage);
return playerPage->GetControls();
@ -406,7 +404,6 @@ protected:
}
private:
ScenarioEditor& m_ScenarioEditor;
std::vector<PlayerNotebookPage*> m_Pages;
DECLARE_EVENT_TABLE();
@ -530,7 +527,6 @@ private:
bool m_InGUIUpdate;
AtObj m_PlayerDefaults;
PlayerNotebook* m_Players;
ScenarioEditor& m_ScenarioEditor;
std::vector<PlayerPageControls> m_PlayerControls;
Observable<AtObj>& m_MapSettings;
size_t m_NumPlayers;
@ -555,7 +551,7 @@ BEGIN_EVENT_TABLE(PlayerSettingsControl, wxPanel)
END_EVENT_TABLE();
PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& scenarioEditor)
: wxPanel(parent, wxID_ANY), m_ScenarioEditor(scenarioEditor), m_InGUIUpdate(false), m_MapSettings(scenarioEditor.GetMapSettings()), m_NumPlayers(0)
: wxPanel(parent, wxID_ANY), m_InGUIUpdate(false), m_MapSettings(scenarioEditor.GetMapSettings()), m_NumPlayers(0)
{
// To prevent recursion, don't handle GUI events right now
m_InGUIUpdate = true;
@ -571,7 +567,7 @@ PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& s
boxSizer->Add(numPlayersSpin);
sizer->Add(boxSizer, wxSizerFlags().Expand().Proportion(0));
sizer->AddSpacer(5);
m_Players = new PlayerNotebook(m_ScenarioEditor, this);
m_Players = new PlayerNotebook(this);
sizer->Add(m_Players, wxSizerFlags().Expand().Proportion(1));
m_InGUIUpdate = false;