GameUIConfig* member removed
authordisplacer
Fri, 18 Aug 2006 19:59:16 +0000
changeset 116 00d3d6d2e699
parent 115 4cce20ef48ea
child 117 d21a48200772
GameUIConfig* member removed
QTfrontend/game.cpp
QTfrontend/hwform.cpp
QTfrontend/team.cpp
QTfrontend/team.h
QTfrontend/teamselhelper.cpp
--- a/QTfrontend/game.cpp	Fri Aug 18 14:17:25 2006 +0000
+++ b/QTfrontend/game.cpp	Fri Aug 18 19:59:16 2006 +0000
@@ -360,7 +360,7 @@
 
 void HWGame::LocalCFG(const QString & teamname)
 {
-	HWTeam team(teamname, config);
+	HWTeam team(teamname);
 	if (!team.LoadFromFile()) {
 		QMessageBox::critical(0,
 				"Error",
@@ -375,6 +375,6 @@
 
 void HWGame::LocalCFG(quint8 num)
 {
-	HWTeam team(num, config);
+	HWTeam team(num);
 	RawSendIPC(team.IPCTeamInfo());
 }
--- a/QTfrontend/hwform.cpp	Fri Aug 18 14:17:25 2006 +0000
+++ b/QTfrontend/hwform.cpp	Fri Aug 18 19:59:16 2006 +0000
@@ -60,7 +60,7 @@
 	QStringList teamslist = config->GetTeamsList();
 
 	if(teamslist.empty()) {
-		HWTeam defaultTeam("DefaultTeam", config);
+		HWTeam defaultTeam("DefaultTeam");
 		defaultTeam.SaveToFile();
 		teamslist.push_back("DefaultTeam");
 	}
@@ -152,14 +152,14 @@
 
 void HWForm::NewTeam()
 {
-	tmpTeam = new HWTeam("unnamed", config);
+	tmpTeam = new HWTeam("unnamed");
 
 	ui.Pages->setCurrentIndex(ID_PAGE_SETUP_TEAM);
 }
 
 void HWForm::EditTeam()
 {
-	tmpTeam = new HWTeam(ui.pageOptions->CBTeamName->currentText(), config);
+	tmpTeam = new HWTeam(ui.pageOptions->CBTeamName->currentText());
 	tmpTeam->LoadFromFile();
 	tmpTeam->SetToPage(this);
 	ui.Pages->setCurrentIndex(ID_PAGE_SETUP_TEAM);
@@ -238,7 +238,7 @@
 
 void HWForm::NetAddTeam()
 {
-	HWTeam team("DefaultTeam", config);
+	HWTeam team("DefaultTeam");
 	team.LoadFromFile();
 	hwnet->AddTeam(team);
 }
--- a/QTfrontend/team.cpp	Fri Aug 18 14:17:25 2006 +0000
+++ b/QTfrontend/team.cpp	Fri Aug 18 19:59:16 2006 +0000
@@ -41,9 +41,8 @@
 #include "pages.h"
 #include "hwconsts.h"
 
-HWTeam::HWTeam(const QString & teamname, GameUIConfig * config)
+HWTeam::HWTeam(const QString & teamname)
 {
-	this->config = config;
 	TeamName = teamname;
 	for (int i = 0; i < 8; i++) HHName[i].sprintf("hedgehog %d", i);
 	Grave = "Simple";
@@ -55,9 +54,8 @@
 	}
 }
 
-HWTeam::HWTeam(quint8 num, GameUIConfig * config)
+HWTeam::HWTeam(quint8 num)
 {
-	this->config = config;
 	num %= PREDEFTEAMS_COUNT;
 	TeamName = QApplication::translate("teams", pteams[num].TeamName);
 	HHName[0] = QApplication::translate("teams", pteams[num].hh0name);
--- a/QTfrontend/team.h	Fri Aug 18 14:17:25 2006 +0000
+++ b/QTfrontend/team.h	Fri Aug 18 19:59:16 2006 +0000
@@ -43,8 +43,8 @@
 class HWTeam
 {
 	public:
-		HWTeam(const QString & teamname, GameUIConfig * config);
-		HWTeam(quint8 num, GameUIConfig * config);
+		HWTeam(const QString & teamname);
+		HWTeam(quint8 num);
 
 		QString TeamName;
 		QString HHName[8];
@@ -58,7 +58,6 @@
 		void GetFromPage(HWForm * hwform);
 		QByteArray IPCTeamInfo() const;
 	private:
-		GameUIConfig * config;
 };
 
 #endif
--- a/QTfrontend/teamselhelper.cpp	Fri Aug 18 14:17:25 2006 +0000
+++ b/QTfrontend/teamselhelper.cpp	Fri Aug 18 19:59:16 2006 +0000
@@ -13,7 +13,7 @@
 {
   this->setMaximumHeight(40);
   QLabel* pixlbl=new QLabel();
-  pixlbl->setPixmap(QPixmap("./Data/Graphics/thinking.png"));
+  pixlbl->setPixmap(QPixmap("../share/hedgewars/Data/Graphics/thinking.png"));
   mainLayout.addWidget(pixlbl);
 
   TeamLabel* lbl=new TeamLabel(team.teamName);