Bläddra i källkod

Remove uncompleted code

nordsoft 2 år sedan
förälder
incheckning
0c41787ca5
2 ändrade filer med 2 tillägg och 37 borttagningar
  1. 2 22
      client/lobby/RandomMapTab.cpp
  2. 0 15
      client/lobby/RandomMapTab.h

+ 2 - 22
client/lobby/RandomMapTab.cpp

@@ -105,7 +105,8 @@ RandomMapTab::RandomMapTab():
 	
 	
 	addCallback("teamAlignments", [&](int)
 	addCallback("teamAlignments", [&](int)
 	{
 	{
-		GH.pushIntT<TeamAlignmentsWidget>(*this);
+		//TODO: support team alignments
+		//GH.pushIntT<TeamAlignmentsWidget>(*this);
 	});
 	});
 	
 	
 	for(auto road : VLC->terrainTypeHandler->roads())
 	for(auto road : VLC->terrainTypeHandler->roads())
@@ -448,24 +449,3 @@ void TemplatesDropBox::setTemplate(const CRmgTemplate * tmpl)
 	assert(GH.topInt().get() == this);
 	assert(GH.topInt().get() == this);
 	GH.popInt(GH.topInt());
 	GH.popInt(GH.topInt());
 }
 }
-
-TeamAlignmentsWidget::TeamAlignmentsWidget(RandomMapTab & randomMapTab):
-	CIntObject(),
-	randomMapTab(randomMapTab)
-{
-	OBJ_CONSTRUCTION;
-	
-	pos.w = 300;
-	pos.h = 300;
-	background = std::make_shared<CFilledTexture>("Bl3DCvex", pos);
-	center(pos);
-	
-	buttonOk = std::make_shared<CButton>(Point(43, 240), "MUBCHCK.DEF", CGI->generaltexth->zelp[560], [](){});
-	buttonCancel = std::make_shared<CButton>(Point(193, 240), "MUBCANC.DEF", CGI->generaltexth->zelp[561], [&]()
-	{
-		assert(GH.topInt().get() == this);
-		GH.popInt(GH.topInt());
-	}, SDLK_ESCAPE);
-	
-	
-}

+ 0 - 15
client/lobby/RandomMapTab.h

@@ -84,18 +84,3 @@ private:
 	std::vector<const CRmgTemplate *> curItems;
 	std::vector<const CRmgTemplate *> curItems;
 	
 	
 };
 };
-
-class TeamAlignmentsWidget: public CIntObject
-{
-public:
-	TeamAlignmentsWidget(RandomMapTab & randomMapTab);
-	
-private:
-	
-	RandomMapTab & randomMapTab;
-	
-	std::shared_ptr<CFilledTexture> background;
-	std::shared_ptr<CLabelGroup> labels;
-	std::shared_ptr<CButton> buttonOk, buttonCancel;
-	std::vector<std::shared_ptr<CToggleGroup>> teams;
-};