samples; coursework: Fixed random seeding with time not working

- double value would overflow DWORD range on long Windows uptime, and always on Unix as GetTime() returns time since the epoch

diff --git a/installer/coursework/Chapter 6 - Classes, Methods and Instances/Lab6/lab6.ec b/installer/coursework/Chapter 6 - Classes, Methods and Instances/Lab6/lab6.ec
index 268655a..9002aa6 100644 (file)
--- a/installer/coursework/Chapter 6 - Classes, Methods and Instances/Lab6/lab6.ec
+++ b/installer/coursework/Chapter 6 - Classes, Methods and Instances/Lab6/lab6.ec
@@ -576,7 +576,7 @@ class RPGApp : Application
 
    void Main()
    {
-      RandomSeed((uint)(GetTime()*1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       PrintLn("Welcome to this great minimalist RPG!");
       PrintLn("You will need to save the princess from an Evil Sorcerer.");
       PrintLn("But first you should wander the realm to fight the sorcerer's minions, ");

diff --git a/samples/db/MedDB/med.ec b/samples/db/MedDB/med.ec
index ca9741a..3e38291 100644 (file)
--- a/samples/db/MedDB/med.ec
+++ b/samples/db/MedDB/med.ec
@@ -154,7 +154,7 @@ class MyApp : GuiApplication
 {
    MyApp()
    {
-      RandomSeed((uint)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       SetDefaultIdField("id");
       SetDefaultNameField("name");
       ds = DataSource { driver = "EDB" };

diff --git a/samples/eC/neural/neural.ec b/samples/eC/neural/neural.ec
index 094d460..4651023 100644 (file)
--- a/samples/eC/neural/neural.ec
+++ b/samples/eC/neural/neural.ec
@@ -83,7 +83,7 @@ class NeuralApp : Application
       int i,h,o;
       int c;
 
-      RandomSeed((int)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       // Input to hidden cells synapses
       for(i = 0; i<NUM_HIDDEN; i++)
          hiddenNeurons[i].Init();

diff --git a/samples/games/cards/poker/poker.ec b/samples/games/cards/poker/poker.ec
index 741ad12..823cf4a 100644 (file)
--- a/samples/games/cards/poker/poker.ec
+++ b/samples/games/cards/poker/poker.ec
@@ -454,7 +454,7 @@ class PokerApp : GuiApplication
    {
       int c;
       // Initialize Card Deck
-      RandomSeed((int)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       for(c = 0; c<52; c++)
          deck[c] = c;
 

diff --git a/samples/games/cards/ruff/src/server.ec b/samples/games/cards/ruff/src/server.ec
index 371c129..b1ab834 100644 (file)
--- a/samples/games/cards/ruff/src/server.ec
+++ b/samples/games/cards/ruff/src/server.ec
@@ -70,7 +70,7 @@ static void Server_ShuffleDeck(Card * deck)
    int t;
    int count;
 
-   RandomSeed((int)(GetTime() * 1000));
+   RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
 
    count = GetRandom(1000, 2000);
    for(t = 0; t<count; t++)
@@ -172,7 +172,7 @@ void Server_StartGame(RuffGame game)
    int c;
 
    // New Game
-   RandomSeed((int)(GetTime() * 1000));
+   RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
    game.rounds[0].shuffle = (PlayerPosition)GetRandom(0, 3);
    game.round = 0;
    game.gameStarted = true;

diff --git a/samples/games/cards/tongIts/tongits.ec b/samples/games/cards/tongIts/tongits.ec
index c5cad89..5711302 100644 (file)
--- a/samples/games/cards/tongIts/tongits.ec
+++ b/samples/games/cards/tongIts/tongits.ec
@@ -162,7 +162,7 @@ class TongIts : Window
    bool OnCreate()
    {
       int c;
-      RandomSeed((int)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       NewDeckOfCards();
       Shuffle();
       DealCards(numOfPlayers);

diff --git a/samples/games/chess/src/ai.ec b/samples/games/chess/src/ai.ec
index e623d3b..4fc87d9 100644 (file)
--- a/samples/games/chess/src/ai.ec
+++ b/samples/games/chess/src/ai.ec
@@ -379,7 +379,7 @@ class AIThread : Thread
       int startRating = EvaluateMaterial(chessState->board, chessState->turn);
       int depth = MAXDEPTH;
 
-      RandomSeed((int)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       aiMoveResult = FindMove(chessState, 0, &depth, &aiMove, startRating, null, 0, null, &abortAI);
 
       return 0;

diff --git a/samples/games/chess/src/chess.ec b/samples/games/chess/src/chess.ec
index 63383a8..19bc3f1 100644 (file)
--- a/samples/games/chess/src/chess.ec
+++ b/samples/games/chess/src/chess.ec
@@ -149,7 +149,7 @@ class Chess : Window
 
             EnableMenus();
 
-            RandomSeed((int)(GetTime() * 10000));
+            RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
 
             NewGame();
          }

diff --git a/samples/games/crosswords/CrossWordsServer.ec b/samples/games/crosswords/CrossWordsServer.ec
index b359ae7..253f611 100644 (file)
--- a/samples/games/crosswords/CrossWordsServer.ec
+++ b/samples/games/crosswords/CrossWordsServer.ec
@@ -1,6 +1,6 @@
 import "crossWords"
 
-int seed;
+uint seed;
 
 // FOR COMMUNICATION //////////////////////////////////////////
 struct PlayedTile
@@ -185,7 +185,7 @@ class CrossWordsGame
             lettersAvailable[l] = lettersCount[language][l];
          }
 
-         seed = (uint)(GetTime() * 1000);
+         seed = (uint)(((uint64)(GetTime() * 1000)) & MAXDWORD);
          //seed = 256131322;
          RandomSeed(seed);
          //Logf("Seeded with %d\n", seed);

diff --git a/samples/games/tetrominoes/tetrominoes.ec b/samples/games/tetrominoes/tetrominoes.ec
index b06b5e7..d0b937a 100644 (file)
--- a/samples/games/tetrominoes/tetrominoes.ec
+++ b/samples/games/tetrominoes/tetrominoes.ec
@@ -263,7 +263,7 @@ class Tetrominoes : Window
             board[y][x] = 0;
       turn = CLIENT;
       Update(null);
-      RandomSeed((uint)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
       nextPiece = GetRandom(0, 6);
       nextAngle = GetRandom(0, 3);
       NewPiece();

diff --git a/samples/games/ticTacToe/TicTacToe.ec b/samples/games/ticTacToe/TicTacToe.ec
index 36ce40c..9a311cb 100644 (file)
--- a/samples/games/ticTacToe/TicTacToe.ec
+++ b/samples/games/ticTacToe/TicTacToe.ec
@@ -23,7 +23,7 @@ class TicTacToe : Window
 
    TicTacToe()
    {
-      RandomSeed((uint)(GetTime() * 1000));
+      RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD));
    }
 
    TTTSquare FindTicTacToe(TTTSquare state[3][3])

diff --git a/samples/guiAndGfx/snow/snow.ec b/samples/guiAndGfx/snow/snow.ec
index 8b217e0..9e01c11 100644 (file)
--- a/samples/guiAndGfx/snow/snow.ec
+++ b/samples/guiAndGfx/snow/snow.ec
@@ -30,7 +30,7 @@ class Snowing : Window
    int lastLine;
    Bitmap buffer { };
 
-   Snowing() { RandomSeed((uint)(GetTime() * 100000)); ((GuiApplication)__thisModule).timerResolution = 60; }
+   Snowing() { RandomSeed((uint)(((uint64)(GetTime() * 1000)) & MAXDWORD)); ((GuiApplication)__thisModule).timerResolution = 60; }
 
    Timer timer
    {