Skip to content

Commit

Permalink
Major bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Maerciezz committed May 28, 2022
1 parent 12496e1 commit 2780d48
Show file tree
Hide file tree
Showing 10 changed files with 1,292 additions and 1,155 deletions.
4 changes: 2 additions & 2 deletions Het DJG Toernooi/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.0.343.0")>
<Assembly: AssemblyFileVersion("1.0.343.0")>
<Assembly: AssemblyVersion("1.0.344.0")>
<Assembly: AssemblyFileVersion("1.0.344.0")>
1 change: 1 addition & 0 deletions Het DJG Toernooi/Source_Scripts/Lifelines/LifeLineDouble.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Public Class LifeLineDouble
dd_Final.URL = Application.StartupPath + "\Sounds\doubledip_final1.mp3"
ElseIf chance = 1 Then
dd_Final.URL = Application.StartupPath + "\Sounds\doubledip_final2.mp3"
chance = 0
active = False
End If
dd_Final.controls.play()
Expand Down
2 changes: 1 addition & 1 deletion Het DJG Toernooi/The Millionaire Game.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<SuiteName>Het TeamDJG Toernooi</SuiteName>
<AutorunEnabled>true</AutorunEnabled>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>1.0.342.0</ApplicationVersion>
<ApplicationVersion>1.0.343.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
Expand Down
16 changes: 8 additions & 8 deletions MillionaireGameQEditor/ChangeLevel!Question.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ private void btnYes_Click(object sender, EventArgs e)
cmd.Parameters.AddWithValue("@Question", question);
cmd.Parameters.AddWithValue("@A", A);
cmd.Parameters.AddWithValue("@B", B);
cmd.Parameters.AddWithValue("@C", B);
cmd.Parameters.AddWithValue("@D", C);
cmd.Parameters.AddWithValue("@C", C);
cmd.Parameters.AddWithValue("@D", D);
cmd.Parameters.AddWithValue("@Correct", Correct);
cmd.Parameters.AddWithValue("@Type", levelType);
cmd.Parameters.AddWithValue("@Note", Note);
Expand All @@ -70,8 +70,8 @@ private void btnYes_Click(object sender, EventArgs e)
cmd.Parameters.AddWithValue("@Question", question);
cmd.Parameters.AddWithValue("@A", A);
cmd.Parameters.AddWithValue("@B", B);
cmd.Parameters.AddWithValue("@C", B);
cmd.Parameters.AddWithValue("@D", C);
cmd.Parameters.AddWithValue("@C", C);
cmd.Parameters.AddWithValue("@D", D);
cmd.Parameters.AddWithValue("@Correct", Correct);
cmd.Parameters.AddWithValue("@Type", levelType);
cmd.Parameters.AddWithValue("@Note", Note);
Expand All @@ -86,8 +86,8 @@ private void btnYes_Click(object sender, EventArgs e)
cmd.Parameters.AddWithValue("@Question", question);
cmd.Parameters.AddWithValue("@A", A);
cmd.Parameters.AddWithValue("@B", B);
cmd.Parameters.AddWithValue("@C", B);
cmd.Parameters.AddWithValue("@D", C);
cmd.Parameters.AddWithValue("@C", C);
cmd.Parameters.AddWithValue("@D", D);
cmd.Parameters.AddWithValue("@Correct", Correct);
cmd.Parameters.AddWithValue("@Type", levelType);
cmd.Parameters.AddWithValue("@Note", Note);
Expand All @@ -102,8 +102,8 @@ private void btnYes_Click(object sender, EventArgs e)
cmd.Parameters.AddWithValue("@Question", question);
cmd.Parameters.AddWithValue("@A", A);
cmd.Parameters.AddWithValue("@B", B);
cmd.Parameters.AddWithValue("@C", B);
cmd.Parameters.AddWithValue("@D", C);
cmd.Parameters.AddWithValue("@C", C);
cmd.Parameters.AddWithValue("@D", D);
cmd.Parameters.AddWithValue("@Correct", Correct);
cmd.Parameters.AddWithValue("@Type", levelType);
cmd.Parameters.AddWithValue("@Note", Note);
Expand Down
10 changes: 10 additions & 0 deletions MillionaireGameQEditor/EditQuestion.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 45 additions & 4 deletions MillionaireGameQEditor/EditQuestion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ private void frmEditQuestion_Load(object sender, EventArgs e)
{
txtCorrect.Visible = false;
pnlFFFAnswer.Visible = true;
btnReset.Enabled = true;
}
else
{
Expand All @@ -111,52 +112,92 @@ private void frmEditQuestion_Load(object sender, EventArgs e)
}
}

private void btnFFFA_Click(object sender, EventArgs e)
private void btnReset_Click(object sender, EventArgs e)
{
lblAnswer.Text = "*";
fff_answer = 0;
btnFFFA.Enabled = true;
btnFFFB.Enabled = true;
btnFFFC.Enabled = true;
btnFFFD.Enabled = true;
btnSave.Enabled = false;
}

private void btnCancel_Click(object sender, EventArgs e)
{
this.Close();
}

private void btnFFFA_Click_1(object sender, EventArgs e)
{
if (fff_answer == 0)
{
lblAnswer.Text = "";
}

lblAnswer.Text = lblAnswer.Text + "A";
btnFFFA.Enabled = false;
btnReset.Enabled = true;

fff_answer++;
if (fff_answer == 4)
{
btnSave.Enabled = true;
}
}

private void btnFFFB_Click(object sender, EventArgs e)
private void btnFFFB_Click_1(object sender, EventArgs e)
{
if (fff_answer == 0)
{
lblAnswer.Text = "";
}

lblAnswer.Text = lblAnswer.Text + "B";
btnFFFB.Enabled = false;
btnReset.Enabled = true;

fff_answer++;
if (fff_answer == 4)
{
btnSave.Enabled = true;
}
}

private void btnFFFC_Click(object sender, EventArgs e)
private void btnFFFC_Click_1(object sender, EventArgs e)
{
if (fff_answer == 0)
{
lblAnswer.Text = "";
}

lblAnswer.Text = lblAnswer.Text + "C";
btnFFFC.Enabled = false;
btnReset.Enabled = true;

fff_answer++;
if (fff_answer == 4)
{
btnSave.Enabled = true;
}
}

private void btnFFFD_Click(object sender, EventArgs e)
private void btnFFFD_Click_1(object sender, EventArgs e)
{
if (fff_answer == 0)
{
lblAnswer.Text = "";
}

lblAnswer.Text = lblAnswer.Text + "D";
btnFFFD.Enabled = false;
btnReset.Enabled = true;

fff_answer++;
if (fff_answer == 4)
{
btnSave.Enabled = true;
}
}
}
}
4 changes: 2 additions & 2 deletions MillionaireGameQEditor/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.52.0")]
[assembly: AssemblyFileVersion("1.0.52.0")]
[assembly: AssemblyVersion("1.0.63.0")]
[assembly: AssemblyFileVersion("1.0.63.0")]
20 changes: 13 additions & 7 deletions MillionaireGameQEditor/QuestionManager.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2780d48

Please sign in to comment.