소스 검색

Fix editor build

Ivan Savenko 1 년 전
부모
커밋
fd17133da3
2개의 변경된 파일16개의 추가작업 그리고 12개의 파일을 삭제
  1. 6 2
      lib/mapping/CMap.cpp
  2. 10 10
      mapeditor/mapsettings/generalsettings.cpp

+ 6 - 2
lib/mapping/CMap.cpp

@@ -42,8 +42,12 @@ DisposedHero::DisposedHero() : heroId(0), portrait(255)
 
 }
 
-CMapEvent::CMapEvent() : players(0), humanAffected(0), computerAffected(0),
-	firstOccurence(0), nextOccurence(0)
+CMapEvent::CMapEvent()
+	: players(0)
+	, humanAffected(false)
+	, computerAffected(false)
+	, firstOccurence(0)
+	, nextOccurence(0)
 {
 
 }

+ 10 - 10
mapeditor/mapsettings/generalsettings.cpp

@@ -35,23 +35,23 @@ void GeneralSettings::initialize(MapController & c)
 	//set difficulty
 	switch(controller->map()->difficulty)
 	{
-		case 0:
+		case EMapDifficulty::EASY:
 			ui->diffRadio1->setChecked(true);
 			break;
 
-		case 1:
+		case EMapDifficulty::NORMAL:
 			ui->diffRadio2->setChecked(true);
 			break;
 
-		case 2:
+		case EMapDifficulty::HARD:
 			ui->diffRadio3->setChecked(true);
 			break;
 
-		case 3:
+		case EMapDifficulty::EXPERT:
 			ui->diffRadio4->setChecked(true);
 			break;
 
-		case 4:
+		case EMapDifficulty::IMPOSSIBLE:
 			ui->diffRadio5->setChecked(true);
 			break;
 	};
@@ -67,11 +67,11 @@ void GeneralSettings::update()
 		controller->map()->levelLimit = 0;
 
 	//set difficulty
-	if(ui->diffRadio1->isChecked()) controller->map()->difficulty = 0;
-	if(ui->diffRadio2->isChecked()) controller->map()->difficulty = 1;
-	if(ui->diffRadio3->isChecked()) controller->map()->difficulty = 2;
-	if(ui->diffRadio4->isChecked()) controller->map()->difficulty = 3;
-	if(ui->diffRadio5->isChecked()) controller->map()->difficulty = 4;
+	if(ui->diffRadio1->isChecked()) controller->map()->difficulty = EMapDifficulty::EASY;
+	if(ui->diffRadio2->isChecked()) controller->map()->difficulty = EMapDifficulty::NORMAL;
+	if(ui->diffRadio3->isChecked()) controller->map()->difficulty = EMapDifficulty::HARD;
+	if(ui->diffRadio4->isChecked()) controller->map()->difficulty = EMapDifficulty::EXPERT;
+	if(ui->diffRadio5->isChecked()) controller->map()->difficulty = EMapDifficulty::IMPOSSIBLE;
 }
 
 void GeneralSettings::on_heroLevelLimitCheck_toggled(bool checked)