[gbrainy] Initialize as protected member
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy] Initialize as protected member
- Date: Sat, 5 Jun 2010 08:20:46 +0000 (UTC)
commit c13b51eca052c3919771d57d445ad3bf364645d5
Author: Jordi Mas <jmas softcatala org>
Date: Sat Jun 5 10:21:39 2010 +0200
Initialize as protected member
src/Core/Main/Game.cs | 3 +--
src/Core/Main/Memory.cs | 2 +-
src/Core/Main/Verbal/AnalogiesMultipleOptions.cs | 2 +-
.../Main/Verbal/AnalogiesPairOfWordsCompare.cs | 2 +-
.../Main/Verbal/AnalogiesPairOfWordsOptions.cs | 2 +-
src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs | 2 +-
src/Core/Main/Xml/GameXml.cs | 2 +-
src/Games/Calculation/CalculationArithmetical.cs | 2 +-
src/Games/Calculation/CalculationAverage.cs | 2 +-
src/Games/Calculation/CalculationCloserFraction.cs | 2 +-
src/Games/Calculation/CalculationFractions.cs | 2 +-
.../Calculation/CalculationGreatestDivisor.cs | 2 +-
src/Games/Calculation/CalculationOperator.cs | 2 +-
src/Games/Calculation/CalculationPrimes.cs | 2 +-
src/Games/Calculation/CalculationProportions.cs | 2 +-
src/Games/Calculation/CalculationRatio.cs | 2 +-
src/Games/Calculation/CalculationTwoNumbers.cs | 2 +-
src/Games/Logic/Puzzle3DCube.cs | 2 +-
src/Games/Logic/PuzzleBalance.cs | 2 +-
src/Games/Logic/PuzzleBuildTriangle.cs | 2 +-
src/Games/Logic/PuzzleCirclesRectangle.cs | 2 +-
src/Games/Logic/PuzzleClocks.cs | 2 +-
src/Games/Logic/PuzzleCountCircles.cs | 2 +-
src/Games/Logic/PuzzleCountSeries.cs | 2 +-
src/Games/Logic/PuzzleCounting.cs | 2 +-
src/Games/Logic/PuzzleCoverPercentage.cs | 2 +-
src/Games/Logic/PuzzleCube.cs | 2 +-
src/Games/Logic/PuzzleDice.cs | 2 +-
src/Games/Logic/PuzzleDivideCircle.cs | 2 +-
src/Games/Logic/PuzzleEquation.cs | 2 +-
src/Games/Logic/PuzzleExtraCircle.cs | 2 +-
src/Games/Logic/PuzzleFigureLetter.cs | 2 +-
src/Games/Logic/PuzzleFigurePattern.cs | 2 +-
src/Games/Logic/PuzzleFigures.cs | 2 +-
src/Games/Logic/PuzzleFourSided.cs | 2 +-
src/Games/Logic/PuzzleHandshakes.cs | 2 +-
src/Games/Logic/PuzzleLargerShape.cs | 2 +-
src/Games/Logic/PuzzleLines.cs | 2 +-
src/Games/Logic/PuzzleMatrixGroups.cs | 2 +-
src/Games/Logic/PuzzleMatrixNumbers.cs | 2 +-
src/Games/Logic/PuzzleMissingPiece.cs | 2 +-
src/Games/Logic/PuzzleMissingSlice.cs | 2 +-
src/Games/Logic/PuzzleMostInCommon.cs | 2 +-
src/Games/Logic/PuzzleMoveFigure.cs | 2 +-
src/Games/Logic/PuzzleNextFigure.cs | 2 +-
src/Games/Logic/PuzzleNumericRelation.cs | 2 +-
src/Games/Logic/PuzzleNumericSequence.cs | 2 +-
src/Games/Logic/PuzzleOstracism.cs | 2 +-
src/Games/Logic/PuzzlePencil.cs | 2 +-
src/Games/Logic/PuzzlePeopleTable.cs | 2 +-
src/Games/Logic/PuzzlePercentage.cs | 2 +-
src/Games/Logic/PuzzlePredicateLogic.cs | 2 +-
src/Games/Logic/PuzzleQuadrilaterals.cs | 2 +-
src/Games/Logic/PuzzleSquareDots.cs | 2 +-
src/Games/Logic/PuzzleSquareSheets.cs | 2 +-
src/Games/Logic/PuzzleSquares.cs | 2 +-
src/Games/Logic/PuzzleSquaresAndLetters.cs | 2 +-
src/Games/Logic/PuzzleTetris.cs | 2 +-
src/Games/Logic/PuzzleTimeNow.cs | 2 +-
src/Games/Logic/PuzzleTrains.cs | 2 +-
src/Games/Logic/PuzzleTriangles.cs | 2 +-
src/Games/Logic/PuzzleTrianglesWithNumbers.cs | 2 +-
src/Games/Memory/MemoryColouredFigures.cs | 2 +-
src/Games/Memory/MemoryColouredText.cs | 2 +-
src/Games/Memory/MemoryCountDots.cs | 2 +-
src/Games/Memory/MemoryFacts.cs | 2 +-
src/Games/Memory/MemoryFigures.cs | 2 +-
src/Games/Memory/MemoryFiguresAndText.cs | 2 +-
src/Games/Memory/MemoryFiguresNumbers.cs | 2 +-
src/Games/Memory/MemoryIndications.cs | 2 +-
src/Games/Memory/MemoryNumbers.cs | 2 +-
src/Games/Memory/MemoryWords.cs | 2 +-
72 files changed, 72 insertions(+), 73 deletions(-)
---
diff --git a/src/Core/Main/Game.cs b/src/Core/Main/Game.cs
index cb03dbf..f263dc6 100644
--- a/src/Core/Main/Game.cs
+++ b/src/Core/Main/Game.cs
@@ -107,8 +107,7 @@ namespace gbrainy.Core.Main
get { return string.Empty;}
}
- // TODO: This should be protected since we should use Begin
- public abstract void Initialize ();
+ protected abstract void Initialize ();
public virtual int Variants {
get { return 1;}
diff --git a/src/Core/Main/Memory.cs b/src/Core/Main/Memory.cs
index 11201f9..13751ff 100644
--- a/src/Core/Main/Memory.cs
+++ b/src/Core/Main/Memory.cs
@@ -67,7 +67,7 @@ namespace gbrainy.Core.Main
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (Preferences.GetBoolValue (Preferences.MemQuestionWarnKey) == false ||
IsPreviewMode == true) {
diff --git a/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs b/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
index 2050dbc..4f93268 100644
--- a/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
+++ b/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
@@ -76,7 +76,7 @@ namespace gbrainy.Core.Main.Verbal
get { return analogies; }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
current = GetNext ();
diff --git a/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs b/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs
index f0ec6dd..716c4a6 100644
--- a/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs
+++ b/src/Core/Main/Verbal/AnalogiesPairOfWordsCompare.cs
@@ -63,7 +63,7 @@ namespace gbrainy.Core.Main.Verbal
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
current = GetNext ();
diff --git a/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs b/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
index 5210fa2..1a1631c 100644
--- a/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
+++ b/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
@@ -74,7 +74,7 @@ namespace gbrainy.Core.Main.Verbal
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
current = GetNext ();
diff --git a/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs b/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs
index cfcbf05..2d4748c 100644
--- a/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs
+++ b/src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs
@@ -44,7 +44,7 @@ namespace gbrainy.Core.Main.Verbal
get { return analogies; }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
current = GetNext ();
diff --git a/src/Core/Main/Xml/GameXml.cs b/src/Core/Main/Xml/GameXml.cs
index af5f9e5..10058a7 100644
--- a/src/Core/Main/Xml/GameXml.cs
+++ b/src/Core/Main/Xml/GameXml.cs
@@ -91,7 +91,7 @@ namespace gbrainy.Core.Main
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (game.Variants.Count > 0 && game.Variants[current.Variant].Answer != null)
right_answer = game.Variants[current.Variant].Answer;
diff --git a/src/Games/Calculation/CalculationArithmetical.cs b/src/Games/Calculation/CalculationArithmetical.cs
index c5426d2..5d54676 100644
--- a/src/Games/Calculation/CalculationArithmetical.cs
+++ b/src/Games/Calculation/CalculationArithmetical.cs
@@ -53,7 +53,7 @@ namespace gbrainy.Games.Calculation
get {return Catalog.GetString ("What is the result of the arithmetical operation?");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int result = 0, operations = 0;
operation = (Operation) random.Next ((int) Operation.LastOperation);
diff --git a/src/Games/Calculation/CalculationAverage.cs b/src/Games/Calculation/CalculationAverage.cs
index cef4433..a85f7eb 100644
--- a/src/Games/Calculation/CalculationAverage.cs
+++ b/src/Games/Calculation/CalculationAverage.cs
@@ -69,7 +69,7 @@ namespace gbrainy.Games.Calculation
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
bool duplicated;
int nums, options_next, dist, num_size, which = 0;
diff --git a/src/Games/Calculation/CalculationCloserFraction.cs b/src/Games/Calculation/CalculationCloserFraction.cs
index 20bda57..c4721fa 100644
--- a/src/Games/Calculation/CalculationCloserFraction.cs
+++ b/src/Games/Calculation/CalculationCloserFraction.cs
@@ -58,7 +58,7 @@ namespace gbrainy.Games.Calculation
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
options = new double [options_cnt * 2];
bool duplicated;
diff --git a/src/Games/Calculation/CalculationFractions.cs b/src/Games/Calculation/CalculationFractions.cs
index a4e2851..25ce484 100644
--- a/src/Games/Calculation/CalculationFractions.cs
+++ b/src/Games/Calculation/CalculationFractions.cs
@@ -86,7 +86,7 @@ namespace gbrainy.Games.Calculation
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
double rslt = 0;
int factor = Factor;
diff --git a/src/Games/Calculation/CalculationGreatestDivisor.cs b/src/Games/Calculation/CalculationGreatestDivisor.cs
index 41d3c7b..53cd3d2 100644
--- a/src/Games/Calculation/CalculationGreatestDivisor.cs
+++ b/src/Games/Calculation/CalculationGreatestDivisor.cs
@@ -47,7 +47,7 @@ namespace gbrainy.Games.Calculation
get {return Catalog.GetString ("Which of the possible divisors is the greatest that divides all numbers?");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
bool found;
int n, m;
diff --git a/src/Games/Calculation/CalculationOperator.cs b/src/Games/Calculation/CalculationOperator.cs
index ff59ca4..4676559 100644
--- a/src/Games/Calculation/CalculationOperator.cs
+++ b/src/Games/Calculation/CalculationOperator.cs
@@ -76,7 +76,7 @@ namespace gbrainy.Games.Calculation
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
while (true)
{
diff --git a/src/Games/Calculation/CalculationPrimes.cs b/src/Games/Calculation/CalculationPrimes.cs
index 75915f3..72750a0 100644
--- a/src/Games/Calculation/CalculationPrimes.cs
+++ b/src/Games/Calculation/CalculationPrimes.cs
@@ -167,7 +167,7 @@ namespace gbrainy.Games.Calculation
get { return Catalog.GetString ("If the sum of all digits in a given number is divisible by 3, then so is the number. For example 15 = 1 + 5 = 6, which is divisible by 3.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int answer;
int max_primeidx;
diff --git a/src/Games/Calculation/CalculationProportions.cs b/src/Games/Calculation/CalculationProportions.cs
index b1949c7..ee3479b 100644
--- a/src/Games/Calculation/CalculationProportions.cs
+++ b/src/Games/Calculation/CalculationProportions.cs
@@ -50,7 +50,7 @@ namespace gbrainy.Games.Calculation
percentage, num, den, GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int options_next, random_max, which = 0;
diff --git a/src/Games/Calculation/CalculationRatio.cs b/src/Games/Calculation/CalculationRatio.cs
index 61837f3..bff61f5 100644
--- a/src/Games/Calculation/CalculationRatio.cs
+++ b/src/Games/Calculation/CalculationRatio.cs
@@ -69,7 +69,7 @@ namespace gbrainy.Games.Calculation
get { return String.Format (Catalog.GetString ("{0} and {1}"), number_a, number_b); }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int random_max;
diff --git a/src/Games/Calculation/CalculationTwoNumbers.cs b/src/Games/Calculation/CalculationTwoNumbers.cs
index d99229e..61ea8a5 100644
--- a/src/Games/Calculation/CalculationTwoNumbers.cs
+++ b/src/Games/Calculation/CalculationTwoNumbers.cs
@@ -73,7 +73,7 @@ namespace gbrainy.Games.Calculation
get { return String.Format (Catalog.GetString ("{0} and {1}"), number_a, number_b); }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
type = (SubGameTypes) random.Next ((int) SubGameTypes.Length);
diff --git a/src/Games/Logic/Puzzle3DCube.cs b/src/Games/Logic/Puzzle3DCube.cs
index efc52f0..9db9e59 100644
--- a/src/Games/Logic/Puzzle3DCube.cs
+++ b/src/Games/Logic/Puzzle3DCube.cs
@@ -42,7 +42,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("A cube is a regular solid object having six congruent square faces.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int ans, max_random;
diff --git a/src/Games/Logic/PuzzleBalance.cs b/src/Games/Logic/PuzzleBalance.cs
index da09b9e..d1056af 100644
--- a/src/Games/Logic/PuzzleBalance.cs
+++ b/src/Games/Logic/PuzzleBalance.cs
@@ -65,7 +65,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("Every circle counts as two triangles.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int ans = 0;
group = random.Next (3);
diff --git a/src/Games/Logic/PuzzleBuildTriangle.cs b/src/Games/Logic/PuzzleBuildTriangle.cs
index cdffbb2..7c6b45e 100644
--- a/src/Games/Logic/PuzzleBuildTriangle.cs
+++ b/src/Games/Logic/PuzzleBuildTriangle.cs
@@ -75,7 +75,7 @@ namespace gbrainy.Games.Logic
get { return answers[0] + answers[1] + answers[2]; }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
switch (CurrentDifficulty) {
case Difficulty.Easy:
diff --git a/src/Games/Logic/PuzzleCirclesRectangle.cs b/src/Games/Logic/PuzzleCirclesRectangle.cs
index a3ed3f2..334fdd1 100644
--- a/src/Games/Logic/PuzzleCirclesRectangle.cs
+++ b/src/Games/Logic/PuzzleCirclesRectangle.cs
@@ -46,7 +46,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
right_answer = "68";
}
diff --git a/src/Games/Logic/PuzzleClocks.cs b/src/Games/Logic/PuzzleClocks.cs
index 895f9a5..568ec48 100644
--- a/src/Games/Logic/PuzzleClocks.cs
+++ b/src/Games/Logic/PuzzleClocks.cs
@@ -57,7 +57,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("The clocks do not follow the time logic.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int position;
diff --git a/src/Games/Logic/PuzzleCountCircles.cs b/src/Games/Logic/PuzzleCountCircles.cs
index c4dadc7..091ca4a 100644
--- a/src/Games/Logic/PuzzleCountCircles.cs
+++ b/src/Games/Logic/PuzzleCountCircles.cs
@@ -58,7 +58,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("It is an easy exercise if you systematically count the circles.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
double x, y, rad;
diff --git a/src/Games/Logic/PuzzleCountSeries.cs b/src/Games/Logic/PuzzleCountSeries.cs
index 1e41fbc..54056ed 100644
--- a/src/Games/Logic/PuzzleCountSeries.cs
+++ b/src/Games/Logic/PuzzleCountSeries.cs
@@ -46,7 +46,7 @@ namespace gbrainy.Games.Logic
get {return question;}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
switch ((GameType) random.Next ((int) GameType.Length))
{
diff --git a/src/Games/Logic/PuzzleCounting.cs b/src/Games/Logic/PuzzleCounting.cs
index 39a470e..1e2dd3d 100644
--- a/src/Games/Logic/PuzzleCounting.cs
+++ b/src/Games/Logic/PuzzleCounting.cs
@@ -51,7 +51,7 @@ namespace gbrainy.Games.Logic
get { return answer;}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int ans, var, total;
diff --git a/src/Games/Logic/PuzzleCoverPercentage.cs b/src/Games/Logic/PuzzleCoverPercentage.cs
index 09b0b03..ef1ccb6 100644
--- a/src/Games/Logic/PuzzleCoverPercentage.cs
+++ b/src/Games/Logic/PuzzleCoverPercentage.cs
@@ -45,7 +45,7 @@ namespace gbrainy.Games.Logic
get { return "[0-9]+";}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int total = 0;
diff --git a/src/Games/Logic/PuzzleCube.cs b/src/Games/Logic/PuzzleCube.cs
index 4a721a7..7fce852 100755
--- a/src/Games/Logic/PuzzleCube.cs
+++ b/src/Games/Logic/PuzzleCube.cs
@@ -51,7 +51,7 @@ namespace gbrainy.Games.Logic
get {return String.Format (Catalog.GetString ("When folded as a cube, which face on the figure is opposite the face with a {0} drawn on it? Answer the number written on face."), question);}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int pair = random.Next (pairs);
question = (char) (48 + question_answer[pair * 2]);
diff --git a/src/Games/Logic/PuzzleDice.cs b/src/Games/Logic/PuzzleDice.cs
index 6db616c..3a85fcc 100644
--- a/src/Games/Logic/PuzzleDice.cs
+++ b/src/Games/Logic/PuzzleDice.cs
@@ -78,7 +78,7 @@ namespace gbrainy.Games.Logic
get { return problems[problem].rationale; }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
problem = random.Next (problems.Length);
right_answer = problems[problem].answer;
diff --git a/src/Games/Logic/PuzzleDivideCircle.cs b/src/Games/Logic/PuzzleDivideCircle.cs
index d68a4f2..a551c0a 100644
--- a/src/Games/Logic/PuzzleDivideCircle.cs
+++ b/src/Games/Logic/PuzzleDivideCircle.cs
@@ -51,7 +51,7 @@ namespace gbrainy.Games.Logic
get {return Catalog.GetString ("In the last figure, in how many regions is the circle divided into when all dots are connected?");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (CurrentDifficulty==Difficulty.Easy)
dots = 5;
diff --git a/src/Games/Logic/PuzzleEquation.cs b/src/Games/Logic/PuzzleEquation.cs
index 4badbc8..9173019 100644
--- a/src/Games/Logic/PuzzleEquation.cs
+++ b/src/Games/Logic/PuzzleEquation.cs
@@ -45,7 +45,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
bool found = false;
int order = 0, sequential;
diff --git a/src/Games/Logic/PuzzleExtraCircle.cs b/src/Games/Logic/PuzzleExtraCircle.cs
index a450bf6..4514c79 100644
--- a/src/Games/Logic/PuzzleExtraCircle.cs
+++ b/src/Games/Logic/PuzzleExtraCircle.cs
@@ -62,7 +62,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
ArrayListIndicesRandom random_indices = new ArrayListIndicesRandom (total_slices);
Color clr;
diff --git a/src/Games/Logic/PuzzleFigureLetter.cs b/src/Games/Logic/PuzzleFigureLetter.cs
index 7bf7cb1..ede90e9 100644
--- a/src/Games/Logic/PuzzleFigureLetter.cs
+++ b/src/Games/Logic/PuzzleFigureLetter.cs
@@ -79,7 +79,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
question = (QuestionType) random.Next ((int) QuestionType.Length);
diff --git a/src/Games/Logic/PuzzleFigurePattern.cs b/src/Games/Logic/PuzzleFigurePattern.cs
index 4f61236..59aacf6 100644
--- a/src/Games/Logic/PuzzleFigurePattern.cs
+++ b/src/Games/Logic/PuzzleFigurePattern.cs
@@ -58,7 +58,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices = new ArrayListIndicesRandom ((int) Figures.Last);
random_indices.Initialize ();
diff --git a/src/Games/Logic/PuzzleFigures.cs b/src/Games/Logic/PuzzleFigures.cs
index 764fed2..5b94ced 100644
--- a/src/Games/Logic/PuzzleFigures.cs
+++ b/src/Games/Logic/PuzzleFigures.cs
@@ -54,7 +54,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices = new ArrayListIndicesRandom (6);
random_indices.Initialize ();
diff --git a/src/Games/Logic/PuzzleFourSided.cs b/src/Games/Logic/PuzzleFourSided.cs
index f74097d..70be8b2 100644
--- a/src/Games/Logic/PuzzleFourSided.cs
+++ b/src/Games/Logic/PuzzleFourSided.cs
@@ -50,7 +50,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (CurrentDifficulty==Difficulty.Easy)
type = 0;
diff --git a/src/Games/Logic/PuzzleHandshakes.cs b/src/Games/Logic/PuzzleHandshakes.cs
index b3ef802..3b0c6bf 100644
--- a/src/Games/Logic/PuzzleHandshakes.cs
+++ b/src/Games/Logic/PuzzleHandshakes.cs
@@ -44,7 +44,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("Try to imagine a situation in which you are meeting a small number of people.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
handshakes = 0;
diff --git a/src/Games/Logic/PuzzleLargerShape.cs b/src/Games/Logic/PuzzleLargerShape.cs
index f1b8aa5..6be697a 100644
--- a/src/Games/Logic/PuzzleLargerShape.cs
+++ b/src/Games/Logic/PuzzleLargerShape.cs
@@ -124,7 +124,7 @@ namespace gbrainy.Games.Logic
GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
palette = new ColorPalette ();
diff --git a/src/Games/Logic/PuzzleLines.cs b/src/Games/Logic/PuzzleLines.cs
index e3b7671..dd60548 100644
--- a/src/Games/Logic/PuzzleLines.cs
+++ b/src/Games/Logic/PuzzleLines.cs
@@ -50,7 +50,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("It is an easy exercise if you systematically count the lines.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (CurrentDifficulty==Difficulty.Easy)
type = 0;
diff --git a/src/Games/Logic/PuzzleMatrixGroups.cs b/src/Games/Logic/PuzzleMatrixGroups.cs
index 170f2d4..62afe8a 100644
--- a/src/Games/Logic/PuzzleMatrixGroups.cs
+++ b/src/Games/Logic/PuzzleMatrixGroups.cs
@@ -51,7 +51,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
numbers = new int [rows * columns];
bool completed = false;
diff --git a/src/Games/Logic/PuzzleMatrixNumbers.cs b/src/Games/Logic/PuzzleMatrixNumbers.cs
index c8dcde1..3800d1d 100644
--- a/src/Games/Logic/PuzzleMatrixNumbers.cs
+++ b/src/Games/Logic/PuzzleMatrixNumbers.cs
@@ -94,7 +94,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
operation = (Operation) random.Next ((int) Operation.LastOperation);
orientation = (random.Next ((int) 2) == 0) ? true : false;
diff --git a/src/Games/Logic/PuzzleMissingPiece.cs b/src/Games/Logic/PuzzleMissingPiece.cs
index 1e5f3f3..0b362b8 100644
--- a/src/Games/Logic/PuzzleMissingPiece.cs
+++ b/src/Games/Logic/PuzzleMissingPiece.cs
@@ -52,7 +52,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices = new ArrayListIndicesRandom (3);
random_indices.Initialize ();
diff --git a/src/Games/Logic/PuzzleMissingSlice.cs b/src/Games/Logic/PuzzleMissingSlice.cs
index 1bf2a24..ad0d6c3 100644
--- a/src/Games/Logic/PuzzleMissingSlice.cs
+++ b/src/Games/Logic/PuzzleMissingSlice.cs
@@ -79,7 +79,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
sum_offset = random.Next (3);
random_indices = new ArrayListIndicesRandom (slices.Length / items_per_slice);
diff --git a/src/Games/Logic/PuzzleMostInCommon.cs b/src/Games/Logic/PuzzleMostInCommon.cs
index bd0ae1f..acb4493 100644
--- a/src/Games/Logic/PuzzleMostInCommon.cs
+++ b/src/Games/Logic/PuzzleMostInCommon.cs
@@ -96,7 +96,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
// Question
ArrayList array_good = new ArrayList ();
diff --git a/src/Games/Logic/PuzzleMoveFigure.cs b/src/Games/Logic/PuzzleMoveFigure.cs
index 80f7a95..85d3f56 100644
--- a/src/Games/Logic/PuzzleMoveFigure.cs
+++ b/src/Games/Logic/PuzzleMoveFigure.cs
@@ -52,7 +52,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
type = random.Next (2);
lines = 4 + type;
diff --git a/src/Games/Logic/PuzzleNextFigure.cs b/src/Games/Logic/PuzzleNextFigure.cs
index 21ce4dd..c80354b 100644
--- a/src/Games/Logic/PuzzleNextFigure.cs
+++ b/src/Games/Logic/PuzzleNextFigure.cs
@@ -67,7 +67,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices = new ArrayListIndicesRandom ((int) Figures.Last);
random_indices.Initialize ();
diff --git a/src/Games/Logic/PuzzleNumericRelation.cs b/src/Games/Logic/PuzzleNumericRelation.cs
index 6d79b5d..f6e5426 100644
--- a/src/Games/Logic/PuzzleNumericRelation.cs
+++ b/src/Games/Logic/PuzzleNumericRelation.cs
@@ -63,7 +63,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int group = 0, inc = 0;
diff --git a/src/Games/Logic/PuzzleNumericSequence.cs b/src/Games/Logic/PuzzleNumericSequence.cs
index 1522d85..eae7a0f 100644
--- a/src/Games/Logic/PuzzleNumericSequence.cs
+++ b/src/Games/Logic/PuzzleNumericSequence.cs
@@ -60,7 +60,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int[] seeds;
diff --git a/src/Games/Logic/PuzzleOstracism.cs b/src/Games/Logic/PuzzleOstracism.cs
index 1b9b65e..069916f 100644
--- a/src/Games/Logic/PuzzleOstracism.cs
+++ b/src/Games/Logic/PuzzleOstracism.cs
@@ -87,7 +87,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
gametype = (GameType) random.Next ((int) GameType.Last + 1);
diff --git a/src/Games/Logic/PuzzlePencil.cs b/src/Games/Logic/PuzzlePencil.cs
index a939cc1..fa87575 100644
--- a/src/Games/Logic/PuzzlePencil.cs
+++ b/src/Games/Logic/PuzzlePencil.cs
@@ -45,7 +45,7 @@ namespace gbrainy.Games.Logic
GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3), GetPossibleAnswer (4));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices = new ArrayListIndicesRandom (figures);
random_indices.Initialize ();
diff --git a/src/Games/Logic/PuzzlePeopleTable.cs b/src/Games/Logic/PuzzlePeopleTable.cs
index 56de712..8417786 100644
--- a/src/Games/Logic/PuzzlePeopleTable.cs
+++ b/src/Games/Logic/PuzzlePeopleTable.cs
@@ -57,7 +57,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
switch (random.Next (3)) {
case 0:
diff --git a/src/Games/Logic/PuzzlePercentage.cs b/src/Games/Logic/PuzzlePercentage.cs
index 99a92d4..338a06d 100644
--- a/src/Games/Logic/PuzzlePercentage.cs
+++ b/src/Games/Logic/PuzzlePercentage.cs
@@ -57,7 +57,7 @@ namespace gbrainy.Games.Logic
get { return "[0-9]+";}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int ans;
diff --git a/src/Games/Logic/PuzzlePredicateLogic.cs b/src/Games/Logic/PuzzlePredicateLogic.cs
index 4b0d04c..9c874ad 100644
--- a/src/Games/Logic/PuzzlePredicateLogic.cs
+++ b/src/Games/Logic/PuzzlePredicateLogic.cs
@@ -96,7 +96,7 @@ namespace gbrainy.Games.Logic
get {return predicates[question].question;}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int answers;
int correct_answer;
diff --git a/src/Games/Logic/PuzzleQuadrilaterals.cs b/src/Games/Logic/PuzzleQuadrilaterals.cs
index 8b48afc..148ca4f 100644
--- a/src/Games/Logic/PuzzleQuadrilaterals.cs
+++ b/src/Games/Logic/PuzzleQuadrilaterals.cs
@@ -59,7 +59,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices = new ArrayListIndicesRandom ((int) Figures.Last);
random_indices.Initialize ();
diff --git a/src/Games/Logic/PuzzleSquareDots.cs b/src/Games/Logic/PuzzleSquareDots.cs
index 9ace316..d9e225f 100644
--- a/src/Games/Logic/PuzzleSquareDots.cs
+++ b/src/Games/Logic/PuzzleSquareDots.cs
@@ -99,7 +99,7 @@ namespace gbrainy.Games.Logic
GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2)));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
possible_answers = new ArrayListIndicesRandom (3);
possible_answers.Initialize ();
diff --git a/src/Games/Logic/PuzzleSquareSheets.cs b/src/Games/Logic/PuzzleSquareSheets.cs
index d1e17d5..fd26b1c 100644
--- a/src/Games/Logic/PuzzleSquareSheets.cs
+++ b/src/Games/Logic/PuzzleSquareSheets.cs
@@ -46,7 +46,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
right_answer = "5";
}
diff --git a/src/Games/Logic/PuzzleSquares.cs b/src/Games/Logic/PuzzleSquares.cs
index 2147db0..f79eed0 100644
--- a/src/Games/Logic/PuzzleSquares.cs
+++ b/src/Games/Logic/PuzzleSquares.cs
@@ -55,7 +55,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (CurrentDifficulty==Difficulty.Easy)
type = 0;
diff --git a/src/Games/Logic/PuzzleSquaresAndLetters.cs b/src/Games/Logic/PuzzleSquaresAndLetters.cs
index 00f97bf..69fdc09 100644
--- a/src/Games/Logic/PuzzleSquaresAndLetters.cs
+++ b/src/Games/Logic/PuzzleSquaresAndLetters.cs
@@ -47,7 +47,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int first_letter;
ArrayListIndicesRandom first_letters;
diff --git a/src/Games/Logic/PuzzleTetris.cs b/src/Games/Logic/PuzzleTetris.cs
index 8ebf988..2f39456 100644
--- a/src/Games/Logic/PuzzleTetris.cs
+++ b/src/Games/Logic/PuzzleTetris.cs
@@ -49,7 +49,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
random_indices_questions = new ArrayListIndicesRandom (4);
random_indices_questions.Initialize ();
diff --git a/src/Games/Logic/PuzzleTimeNow.cs b/src/Games/Logic/PuzzleTimeNow.cs
index d3e8a13..0538a31 100644
--- a/src/Games/Logic/PuzzleTimeNow.cs
+++ b/src/Games/Logic/PuzzleTimeNow.cs
@@ -57,7 +57,7 @@ namespace gbrainy.Games.Logic
get { return AnswerCheckAttributes.Trim | AnswerCheckAttributes.IgnoreCase | AnswerCheckAttributes.IgnoreSpaces; }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int hour;
DateTime now;
diff --git a/src/Games/Logic/PuzzleTrains.cs b/src/Games/Logic/PuzzleTrains.cs
index 239636c..6f2582b 100644
--- a/src/Games/Logic/PuzzleTrains.cs
+++ b/src/Games/Logic/PuzzleTrains.cs
@@ -55,7 +55,7 @@ namespace gbrainy.Games.Logic
get { return Catalog.GetString ("The distance formula is 'distance = rate x time'.");}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int ans;
double speed_a, speed_b, rslt;
diff --git a/src/Games/Logic/PuzzleTriangles.cs b/src/Games/Logic/PuzzleTriangles.cs
index 54312ff..fea24fc 100644
--- a/src/Games/Logic/PuzzleTriangles.cs
+++ b/src/Games/Logic/PuzzleTriangles.cs
@@ -50,7 +50,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
if (CurrentDifficulty==Difficulty.Easy)
type = 1;
diff --git a/src/Games/Logic/PuzzleTrianglesWithNumbers.cs b/src/Games/Logic/PuzzleTrianglesWithNumbers.cs
index b43b016..594aa24 100644
--- a/src/Games/Logic/PuzzleTrianglesWithNumbers.cs
+++ b/src/Games/Logic/PuzzleTrianglesWithNumbers.cs
@@ -75,7 +75,7 @@ namespace gbrainy.Games.Logic
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
group = random.Next (3);
switch (group) {
diff --git a/src/Games/Memory/MemoryColouredFigures.cs b/src/Games/Memory/MemoryColouredFigures.cs
index 85cc9ce..5490ad4 100644
--- a/src/Games/Memory/MemoryColouredFigures.cs
+++ b/src/Games/Memory/MemoryColouredFigures.cs
@@ -62,7 +62,7 @@ namespace gbrainy.Games.Memory
GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
switch (CurrentDifficulty) {
case Difficulty.Easy:
diff --git a/src/Games/Memory/MemoryColouredText.cs b/src/Games/Memory/MemoryColouredText.cs
index 5bcbdd8..4e9c80e 100644
--- a/src/Games/Memory/MemoryColouredText.cs
+++ b/src/Games/Memory/MemoryColouredText.cs
@@ -46,7 +46,7 @@ namespace gbrainy.Games.Memory
return String.Format (Catalog.GetString ("What was the color of the text that said '{0}'?"), question_colorname);}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
bool done = false;
diff --git a/src/Games/Memory/MemoryCountDots.cs b/src/Games/Memory/MemoryCountDots.cs
index 1e164f7..86b32a9 100644
--- a/src/Games/Memory/MemoryCountDots.cs
+++ b/src/Games/Memory/MemoryCountDots.cs
@@ -55,7 +55,7 @@ namespace gbrainy.Games.Memory
}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
switch (CurrentDifficulty) {
case Difficulty.Easy:
diff --git a/src/Games/Memory/MemoryFacts.cs b/src/Games/Memory/MemoryFacts.cs
index b47f83f..c5ae601 100644
--- a/src/Games/Memory/MemoryFacts.cs
+++ b/src/Games/Memory/MemoryFacts.cs
@@ -60,7 +60,7 @@ namespace gbrainy.Games.Memory
get { return "[0-9]+";}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int fact_idx, quest_idx, questions;
ArrayListIndicesRandom indices;
diff --git a/src/Games/Memory/MemoryFigures.cs b/src/Games/Memory/MemoryFigures.cs
index f2e2d32..04ded32 100644
--- a/src/Games/Memory/MemoryFigures.cs
+++ b/src/Games/Memory/MemoryFigures.cs
@@ -61,7 +61,7 @@ namespace gbrainy.Games.Memory
return Catalog.GetString ("In which cell is the other figure like the one shown below? Answer the cell number." );}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int fig1, fig2;
diff --git a/src/Games/Memory/MemoryFiguresAndText.cs b/src/Games/Memory/MemoryFiguresAndText.cs
index 54050e0..81d3101 100644
--- a/src/Games/Memory/MemoryFiguresAndText.cs
+++ b/src/Games/Memory/MemoryFiguresAndText.cs
@@ -70,7 +70,7 @@ namespace gbrainy.Games.Memory
get {return Catalog.GetString ("The list below enumerates the figures shown in the previous image except for one. Which is the missing figure? Possible answers are triangle, rectangle, pentagon and circle." );}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
ArrayListIndicesRandom figures_random;
int pos = 0;
diff --git a/src/Games/Memory/MemoryFiguresNumbers.cs b/src/Games/Memory/MemoryFiguresNumbers.cs
index 7184753..8674abf 100644
--- a/src/Games/Memory/MemoryFiguresNumbers.cs
+++ b/src/Games/Memory/MemoryFiguresNumbers.cs
@@ -46,7 +46,7 @@ namespace gbrainy.Games.Memory
GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
switch (CurrentDifficulty) {
case Difficulty.Easy:
diff --git a/src/Games/Memory/MemoryIndications.cs b/src/Games/Memory/MemoryIndications.cs
index 0753434..7312b33 100644
--- a/src/Games/Memory/MemoryIndications.cs
+++ b/src/Games/Memory/MemoryIndications.cs
@@ -167,7 +167,7 @@ namespace gbrainy.Games.Memory
GetPossibleAnswer (0), GetPossibleAnswer (1), GetPossibleAnswer (2), GetPossibleAnswer (3));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
indications = new Indication [CurrentDifficulty == Difficulty.Easy ? 5 : 7];
Indication.TurnDirection second_turn = (Indication.TurnDirection) 2 + random.Next (2);
diff --git a/src/Games/Memory/MemoryNumbers.cs b/src/Games/Memory/MemoryNumbers.cs
index df5d0af..d7c0878 100644
--- a/src/Games/Memory/MemoryNumbers.cs
+++ b/src/Games/Memory/MemoryNumbers.cs
@@ -120,7 +120,7 @@ namespace gbrainy.Games.Memory
get { return current_game.Question; }
}
- public override void Initialize ()
+ protected override void Initialize ()
{
base.Initialize ();
int total;
diff --git a/src/Games/Memory/MemoryWords.cs b/src/Games/Memory/MemoryWords.cs
index 069fcbe..469b93e 100644
--- a/src/Games/Memory/MemoryWords.cs
+++ b/src/Games/Memory/MemoryWords.cs
@@ -44,7 +44,7 @@ namespace gbrainy.Games.Memory
return String.Format (Catalog.GetString ("There is a missing word from the previous list. Which one is the missing word?"));}
}
- public override void Initialize ()
+ protected override void Initialize ()
{
int tmp;
words = new List <string> (total_words);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]