# HG changeset patch
# User unc0rr
# Date 1170715141 0
# Node ID 641ed71c7c93b3fcb2771cb85987e99b920bdfb6
# Parent  4c017ae1226a16c6649d489ab74943f2cfffef11
 - Fix net game bug
 - Small cleanup

diff -r 4c017ae1226a -r 641ed71c7c93 QTfrontend/game.cpp
--- a/QTfrontend/game.cpp	Mon Feb 05 20:26:13 2007 +0000
+++ b/QTfrontend/game.cpp	Mon Feb 05 22:39:01 2007 +0000
@@ -50,11 +50,6 @@
 	emit GameStateChanged(gsStopped);
 }
 
-void HWGame::SendTeamConfig(int index)
-{
-	LocalCFG(teams[index]);
-}
-
 void HWGame::commonConfig()
 {
 	QByteArray buf;
@@ -123,10 +118,7 @@
 {
 	switch(msg.at(1)) {
 		case '?': {
-			if (gameType == gtNet)
-				emit SendNet(QByteArray("\x01""?"));
-			else
-				SendIPC("!");
+			SendIPC("!");
 			break;
 		}
 		case 'C': {
@@ -320,16 +312,3 @@
 	Start();
 	emit GameStateChanged(gsStarted);
 }
-
-
-void HWGame::LocalCFG(const QString & teamname)
-{
-	qDebug("HWGame::LocalCFG is UNIMPLEMENTED");
-/*	QByteArray teamcfg;
-	HWTeam team(teamname);
-	team.LoadFromFile();
-	RawSendIPC(HWProto::addStringListToBuffer(teamcfg,
-			team.TeamGameConfig(16776960, 4, gamecfg->getInitHealth())));
-*/
-}
-
diff -r 4c017ae1226a -r 641ed71c7c93 QTfrontend/game.h
--- a/QTfrontend/game.h	Mon Feb 05 20:26:13 2007 +0000
+++ b/QTfrontend/game.h	Mon Feb 05 22:39:01 2007 +0000
@@ -64,7 +64,6 @@
 
 public slots:
 	void FromNet(const QByteArray & msg);
-	void LocalCFG(const QString & teamname);
 
 private:
     enum GameType {
@@ -86,7 +85,6 @@
 	void SendConfig();
 	void SendQuickConfig();
 	void SendNetConfig();
-	void SendTeamConfig(int index);
 	void ParseMessage(const QByteArray & msg);
 	void SaveDemo(const QString & filename);
 };
diff -r 4c017ae1226a -r 641ed71c7c93 QTfrontend/newnetclient.cpp
--- a/QTfrontend/newnetclient.cpp	Mon Feb 05 20:26:13 2007 +0000
+++ b/QTfrontend/newnetclient.cpp	Mon Feb 05 22:39:01 2007 +0000
@@ -79,19 +79,10 @@
   RawSendNet(QString("START:"));
 }
 
-void HWNewNet::SendConfigToEngine()
-{
-
-}
-
 void HWNewNet::SendNet(const QByteArray & buf)
 {
   QString msg = QString(buf.toBase64());
 
-  if(msg == "AUM=") {
-    SendConfigToEngine();
-    return ;
-  }
   //NetBuffer += buf;
   RawSendNet(QString("GAMEMSG:%1%2").arg(delimeter).arg(msg));
 }
@@ -188,11 +179,7 @@
   }
 
   if (lst[0] == "RUNGAME") {
-    HWGame* game = new HWGame(config, m_pGameCFGWidget, m_pTeamSelWidget); // FIXME: memory leak here (stackify it?)
-    connect(game, SIGNAL(SendNet(const QByteArray &)), this, SLOT(SendNet(const QByteArray &)));
-    connect(this, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)));
-    connect(this, SIGNAL(LocalCFG(const QString &)), game, SLOT(LocalCFG(const QString &)));
-    game->StartNet();
+  	RunGame();
   }
 
   if (lst[0] == "CONFIGURED") {
@@ -286,7 +273,7 @@
 
 void HWNewNet::RunGame()
 {
-  HWGame * game = new HWGame(config, 0);
+  HWGame* game = new HWGame(config, m_pGameCFGWidget, m_pTeamSelWidget); // FIXME: memory leak here (stackify it?)
   connect(game, SIGNAL(SendNet(const QByteArray &)), this, SLOT(SendNet(const QByteArray &)));
   connect(this, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)));
   connect(this, SIGNAL(LocalCFG(const QString &)), game, SLOT(LocalCFG(const QString &)));
diff -r 4c017ae1226a -r 641ed71c7c93 QTfrontend/newnetclient.h
--- a/QTfrontend/newnetclient.h	Mon Feb 05 20:26:13 2007 +0000
+++ b/QTfrontend/newnetclient.h	Mon Feb 05 22:39:01 2007 +0000
@@ -58,7 +58,6 @@
 
   void ConfigAsked();
   void RunGame();
-  void SendConfigToEngine();
 
   template <typename T>
   void SendCfgStrNet(T a) {
@@ -89,7 +88,6 @@
   void AddGame(const QString & chan);
   void EnteredGame();
   void FromNet(const QByteArray & buf);
-  void LocalCFG(const QString & team);
   void AddNetTeam(const HWTeam&);
 
   void seedChanged(const QString & seed);