Subversion Repositories spk

Rev

Rev 181 | Rev 191 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 181 Rev 182
Line 79... Line 79...
79 
					TreeNode ^newNode = gcnew TreeNode(_US((*itr)->str));
 79 
					TreeNode ^newNode = gcnew TreeNode(_US((*itr)->str));
80 
 
 80 
 
81 
					int status = (*itr)->data.toInt();
 81 
					int status = (*itr)->data.toInt();
82 
					if ( status == -1 ) // in both
 82 
					if ( status == -1 ) // in both
83 
					{
 83 
					{
84 
						if ( m_pPackages->CanWeMerge((*itr)->str) )
 84 
						if ( m_pPackages->canWeMerge((*itr)->str) )
85 
							merged->Nodes->Add(newNode);
 85 
							merged->Nodes->Add(newNode);
86 
						else if ( m_pPackages->NeedToMerge((*itr)->str) )
 86 
						else if ( m_pPackages->needToMerge((*itr)->str) )
87 
							conflict->Nodes->Add(newNode);
 87 
							conflict->Nodes->Add(newNode);
88 
						else
 88 
						else
89 
							both->Nodes->Add(newNode);
 89 
							both->Nodes->Add(newNode);
90 
					}
 90 
					}
91 
					else if ( status == 1 )
 91 
					else if ( status == 1 )
Line 283... Line 283...
283 
				{
 283 
				{
284 
					this->textBox3->Text = gameDir + " (" + _US(gameName) + ")";
 284 
					this->textBox3->Text = gameDir + " (" + _US(gameName) + ")";
285 
					this->panel5->Enabled = true;
 285 
					this->panel5->Enabled = true;
286 
					this->numericUpDown1->Minimum = 1;
 286 
					this->numericUpDown1->Minimum = 1;
287 
					m_pPackages->setCurrentDir(dir);
 287 
					m_pPackages->setCurrentDir(dir);
288 
					this->numericUpDown1->Maximum = m_pPackages->FindNextFakePatch() - 1;
 288 
					this->numericUpDown1->Maximum = m_pPackages->findNextFakePatch() - 1;
289 
					if ( patch < 1 || patch > this->numericUpDown1->Maximum )
 289 
					if ( patch < 1 || patch > this->numericUpDown1->Maximum )
290 
						this->numericUpDown1->Value = this->numericUpDown1->Maximum;
 290 
						this->numericUpDown1->Value = this->numericUpDown1->Maximum;
291 
					else
 291 
					else
292 
						this->numericUpDown1->Value = patch;
 292 
						this->numericUpDown1->Value = patch;
293 
					this->label5->Text = "(prevent loading added mods, max=" + Convert::ToString(this->numericUpDown1->Maximum) + ")";
 293 
					this->label5->Text = "(prevent loading added mods, max=" + Convert::ToString(this->numericUpDown1->Maximum) + ")";