Merge pull request #29 from panmarco83/partymode_cleanup

comment out remaining partymode functions
janusvr · Oct 26, 2020 · 3f4e5e1 · 3f4e5e1
2 parents b8967a7 + 0fccb54
commit 3f4e5e1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/game.cpp b/src/game.cpp
@@ -292,7 +292,7 @@ void Game::Update()
     UpdateOverlays();
 
     //update follow mode
-    UpdateFollowMode();
+    //UpdateFollowMode();
 
     WebAsset::SetUseCache(SettingsManager::GetCacheEnabled());
 

diff --git a/src/settingsmanager.cpp b/src/settingsmanager.cpp
@@ -46,7 +46,7 @@ void SettingsManager::LoadSettings()
     settings["rotationspeed"] = 50.0f;
     settings["ipd"] = 0.064f;
     settings["haptics"] = true;
-    settings["partymode"] = true;
+    settings["partymode"] = false;
     settings["perflog"] = true;
     settings["playbackdevice"] = QString("Default device");
     settings["capturedevice"] = QString("Default device");

diff --git a/src/socialwindow.cpp b/src/socialwindow.cpp
@@ -26,7 +26,7 @@ SocialWindow::SocialWindow(Game * g) :
     table_partymode->setSortingEnabled(true);
     table_partymode->sortItems(0, Qt::AscendingOrder);
     table_partymode->setSelectionBehavior(QAbstractItemView::SelectItems);
-    connect(table_partymode, SIGNAL(clicked(QModelIndex)), this, SLOT(PartyModeListSelection()));
+    //connect(table_partymode, SIGNAL(clicked(QModelIndex)), this, SLOT(PartyModeListSelection()));
 
     QStringList s2;
     s2.push_back("userid");
@@ -65,8 +65,8 @@ SocialWindow::SocialWindow(Game * g) :
     w->setLayout(layout);
     setCentralWidget(w);
 
-    connect(&partymode_request_timer, SIGNAL(timeout()), this, SLOT(UpdatePartyModeList()));
-    partymode_request_timer.start(5000);
+    //connect(&partymode_request_timer, SIGNAL(timeout()), this, SLOT(UpdatePartyModeList()));
+    //partymode_request_timer.start(5000);
 }
 
 void SocialWindow::Update()
@@ -98,14 +98,14 @@ void SocialWindow::Update()
     }
 
     //update party mode
-    if (partymode_data_request.GetLoaded() && !partymode_data_request.GetProcessed()) {
+    /*if (partymode_data_request.GetLoaded() && !partymode_data_request.GetProcessed()) {
         const QByteArray & ba = partymode_data_request.GetData();
         MathUtil::GetPartyModeData() = QJsonDocument::fromJson(ba).toVariant().toMap()["data"].toList();
         partymode_data_request.SetProcessed(true);
 
         //repopulate the party mode stuff
         UpdatePartyModeTable();
-    }
+    }*/
 
     //update text chat messages
     QList <QPair <QString, QColor> > msgs = game->GetMultiPlayerManager()->GetNewChatMessages();
@@ -120,7 +120,7 @@ void SocialWindow::Update()
 
 void SocialWindow::Shutdown()
 {
-    disconnect(&partymode_request_timer, 0, 0, 0);
+    //disconnect(&partymode_request_timer, 0, 0, 0);
 }
 
 void SocialWindow::UpdatePartyModeList()

diff --git a/src/virtualmenu.cpp b/src/virtualmenu.cpp
@@ -33,14 +33,14 @@ VirtualMenu::VirtualMenu() :
     assetobjs["plane"]->GetProperties()->SetSaveToMarkup(false);
     assetobjs["plane"]->Load();
 
-    connect(&partymode_request_timer, SIGNAL(timeout()), this, SLOT(UpdatePartyModeList()));
-    partymode_request_timer.start(5000);
+    //connect(&partymode_request_timer, SIGNAL(timeout()), this, SLOT(UpdatePartyModeList()));
+    //partymode_request_timer.start(5000);
 }
 
 VirtualMenu::~VirtualMenu()
 {
     Clear();
-    disconnect(&partymode_request_timer, 0, 0, 0);
+    //disconnect(&partymode_request_timer, 0, 0, 0);
 }
 
 void VirtualMenu::SetBookmarkManager(QPointer <BookmarkManager> b)
@@ -187,13 +187,13 @@ void VirtualMenu::Update()
         }
     }   
 
-    if (partymode_data_request.GetLoaded() && !partymode_data_request.GetProcessed()) {
+    /*if (partymode_data_request.GetLoaded() && !partymode_data_request.GetProcessed()) {
         const QByteArray & ba = partymode_data_request.GetData();
         MathUtil::GetPartyModeData() = QJsonDocument::fromJson(ba).toVariant().toMap()["data"].toList();
         partymode_data_request.SetProcessed(true);
         ConstructSubmenus();        
         //qDebug() << MathUtil::GetPartyModeData();
-    }
+    }*/
 
     if (search_data_request.GetLoaded() && !search_data_request.GetProcessed()) {
         const QByteArray & ba = search_data_request.GetData();