hedgewars-draft: comparison QTfrontend/game.cpp

equal deleted inserted replaced

-:e0a76056a633
+:08960209db8c
 #include "ThemeModel.h"
 QString training, campaign, campaignScript, campaignTeam; // TODO: Cleaner solution?
 HWGame::HWGame(GameUIConfig * config, GameCFGWidget * gamecfg, QString ammo, TeamSelWidget* pTeamSelWidget) :
-TCPBase(true, 0),
+TCPBase(0),
 ammostr(ammo),
 m_pTeamSelWidget(pTeamSelWidget)
 {
 this->config = config;
 this->gamecfg = gamecfg;
 {
 SetGameState(gsDestroyed);
 }
 void HWGame::onClientDisconnect()
-{
+{/*
 switch (gameType)
 {
 case gtDemo:
 // for video recording we need demo anyway
 emit HaveRecord(rtNeither, demo);
 emit HaveRecord(rtSave, demo);
 else if (gameState == gsFinished)
 emit HaveRecord(rtDemo, demo);
 else
 emit HaveRecord(rtNeither, demo);
-}
+}*/
 SetGameState(gsStopped);
 }
 void HWGame::commonConfig()
 {
 HWProto::addStringListToBuffer(buf,
 team.teamGameConfig(gamecfg->getInitHealth()));
 ;
 }
 }
-RawSendIPC(buf);
+//RawSendIPC(buf);
 }
 void HWGame::SendConfig()
 {
 commonConfig();
 HWProto::addStringToBuffer(teamscfg, QString("eammprob %1").arg(cDefaultAmmoStore->mid(cAmmoNumber, cAmmoNumber)));
 HWProto::addStringToBuffer(teamscfg, QString("eammdelay %1").arg(cDefaultAmmoStore->mid(2 * cAmmoNumber, cAmmoNumber)));
 HWProto::addStringToBuffer(teamscfg, QString("eammreinf %1").arg(cDefaultAmmoStore->mid(3 * cAmmoNumber, cAmmoNumber)));
 HWProto::addStringToBuffer(teamscfg, QString("eammstore"));
 HWProto::addStringToBuffer(teamscfg, QString("eammstore"));
-RawSendIPC(teamscfg);
+//RawSendIPC(teamscfg);
 }
 void HWGame::SendTrainingConfig()
 {
 QByteArray traincfg;
 HWProto::addStringToBuffer(traincfg, "TL");
 HWProto::addStringToBuffer(traincfg, "eseed " + QUuid::createUuid().toString());
 HWProto::addStringToBuffer(traincfg, "escript " + training);
-RawSendIPC(traincfg);
+//RawSendIPC(traincfg);
 }
 void HWGame::SendCampaignConfig()
 {
 QByteArray campaigncfg;
 HWProto::addStringToBuffer(campaigncfg, "TL");
 HWProto::addStringToBuffer(campaigncfg, "eseed " + QUuid::createUuid().toString());
 HWProto::addStringToBuffer(campaigncfg, "escript " + campaignScript);
-RawSendIPC(campaigncfg);
+// RawSendIPC(campaigncfg);
 }
 void HWGame::SendNetConfig()
 {
 commonConfig();
 {
 switch(msg.at(1))
 {
 case '?':
 {
-SendIPC("!");
+//SendIPC("!");
 break;
 }
 case 'C':
 {
 switch (gameType)
 int size = msg.size();
 QString msgbody = QString::fromUtf8(msg.mid(2).left(size - 4));
 emit SendChat(msgbody);
 QByteArray buf;
 HWProto::addStringToBuffer(buf, "s" + HWProto::formatChatMsg(config->netNick(), msgbody) + "\x20\x20");
-demo.append(buf);
+//demo.append(buf);
 break;
 }
 case 'b':
 {
 int size = msg.size();
 {
 if (gameType == gtNet && !netSuspend)
 {
 emit SendNet(msg);
 }
-demo.append(msg);
+//demo.append(msg);
 }
 }
 }
 void HWGame::FromNet(const QByteArray & msg)
 {
-RawSendIPC(msg);
+//RawSendIPC(msg);
 }
 void HWGame::FromNetChat(const QString & msg)
 {
 QByteArray buf;
 HWProto::addStringToBuffer(buf, 's' + msg + "\x20\x20");
-RawSendIPC(buf);
+//RawSendIPC(buf);
 }
 void HWGame::onClientRead()
-{
+{/*
 quint8 msglen;
 quint32 bufsize;
 while (!readbuffer.isEmpty() && ((bufsize = readbuffer.size()) > 0) &&
 ((msglen = readbuffer.data()[0]) < bufsize))
 {
 QByteArray msg = readbuffer.left(msglen + 1);
 readbuffer.remove(0, msglen + 1);
 ParseMessage(msg);
-}
+}*/
 }
 QStringList HWGame::getArguments()
 {
 QStringList arguments;
 QRect resolution = config->vid_Resolution();
 arguments << cfgdir->absolutePath();
 arguments << QString::number(resolution.width());
 arguments << QString::number(resolution.height());
 arguments << QString::number(config->bitDepth()); // bpp
-arguments << QString("%1").arg(ipc_port);
+//arguments << QString("%1").arg(ipc_port);
 arguments << (config->vid_Fullscreen() ? "1" : "0");
 arguments << (config->isSoundEnabled() ? "1" : "0");
 arguments << (config->isMusicEnabled() ? "1" : "0");
 arguments << QString::number(config->volume()); // sound volume
 arguments << QString::number(config->timerInterval());
 emit ErrorMessage(tr("Cannot open demofile %1").arg(demofilename));
 return ;
 }
 // read demo
-toSendBuf = demofile.readAll();
+//toSendBuf = demofile.readAll();
 // run engine
-demo.clear();
+//demo.clear();
-Start(false);
+start(false);
 SetGameState(gsStarted);
 }
 void HWGame::StartNet()
 {
 gameType = gtNet;
-demo.clear();
+//demo.clear();
-Start(false);
+start(false);
 SetGameState(gsStarted);
 }
 void HWGame::StartLocal()
 {
 gameType = gtLocal;
-demo.clear();
+//demo.clear();
-Start(false);
+start(false);
 SetGameState(gsStarted);
 }
 void HWGame::StartQuick()
 {
 gameType = gtQLocal;
-demo.clear();
+//demo.clear();
-Start(false);
+start(false);
 SetGameState(gsStarted);
 }
 void HWGame::StartTraining(const QString & file)
 {
 gameType = gtTraining;
 training = "Missions/Training/" + file + ".lua";
-demo.clear();
+//demo.clear();
-Start(false);
+start(false);
 SetGameState(gsStarted);
 }
 void HWGame::StartCampaign(const QString & camp, const QString & campScript, const QString & campTeam)
 {
 gameType = gtCampaign;
 campaign = camp;
 campaignScript = "Missions/Campaign/" + camp + "/" + campScript;
 campaignTeam = campTeam;
-demo.clear();
+//demo.clear();
-Start(false);
+start(false);
 SetGameState(gsStarted);
 }
 void HWGame::SetGameState(GameState state)
 {
 void HWGame::abort()
 {
 QByteArray buf;
 HWProto::addStringToBuffer(buf, QString("efinish"));
-RawSendIPC(buf);
+//RawSendIPC(buf);
 }
 void HWGame::sendCampaignVar(const QByteArray &varToSend)
 {
 QString varToFind(varToSend);
 QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + campaignTeam + ".hwt", QSettings::IniFormat, 0);
 teamfile.setIniCodec("UTF-8");
 QString varValue = teamfile.value("Campaign " + campaign + "/" + varToFind, "").toString();
 QByteArray command;
 HWProto::addStringToBuffer(command, "V." + varValue);
-RawSendIPC(command);
+//RawSendIPC(command);
 }
 void HWGame::writeCampaignVar(const QByteArray & varVal)
 {
 int i = varVal.indexOf(" ");
 QSettings teamfile(cfgdir->absolutePath() + "/Teams/" + campaignTeam + ".hwt", QSettings::IniFormat, 0);
 teamfile.setIniCodec("UTF-8");
 teamfile.setValue("Campaign " + campaign + "/" + varToWrite, varValue);
 }
+void HWGame::onEngineStart()
+{
+}

branch	flibqtfrontend
changeset 8092	08960209db8c
parent 8070	66bc20d089fc
child 8100	0e6fadf81a2c