Browse Source

Updates due to changes in OfrontPlus

Arturs Jefimovs 1 month ago
parent
commit
05f15b898e
4 changed files with 6 additions and 6 deletions
  1. 1 1
      src/Env.Mod
  2. 2 2
      src/Files.Mod
  3. 1 1
      src/Random.Mod
  4. 2 2
      src/TermBox.Mod

+ 1 - 1
src/Env.Mod

@@ -1,7 +1,7 @@
 MODULE Env;
 (** OS environment variables
 %RU Переменные окружения ОС *)
-IMPORT CmdArgs, Args, Platform, Utf8, Strings, SYSTEM, Out;
+IMPORT CmdArgs, Platform, Utf8, Strings;
 TYPE SHORTCHAR = Utf8.SHORTCHAR;
 
 VAR count: INTEGER;

+ 2 - 2
src/Files.Mod

@@ -19,7 +19,7 @@ MODULE Files;
       Нуль-терминированные строки,
       компактные числа по М. Одерскому *)
 
-IMPORT SYSTEM, Platform, Heap, Strings, Out, Utf8;
+IMPORT SYSTEM, Platform, CmdArgs, Heap, Strings, Out, Utf8;
 
 CONST
   PathDelimiter = Platform.PathDelimiter;
@@ -1116,7 +1116,7 @@ END SetSearchPath;
 PROCEDURE Init;
 VAR q: ARRAY 2048 OF SHORTCHAR;
 BEGIN tempno := -1; Heap.FileCount := 0; SearchPath := '';
-  Platform.GetEnv('HOME', q); Utf8.Decode(q, home);
+  CmdArgs.GetEnv('HOME', q); Utf8.Decode(q, home);
 END Init;
 
 BEGIN

+ 1 - 1
src/Random.Mod

@@ -46,7 +46,7 @@ RETURN seed MOD range END Int;
 %RU Возвращает случайное вещественное число x, где 0 <= x < 1. *)
 PROCEDURE Uniform*(): REAL;
 BEGIN NextRND
-RETURN (seed - 1) * (1 / (modulo - 1)) END Uniform;
+RETURN FLT(seed - 1) * (1.0 / FLT(modulo - 1)) END Uniform;
 
 (** Initializes the randomization process using current time.
     This procedure is called automatically on module initialization

+ 2 - 2
src/TermBox.Mod

@@ -859,8 +859,8 @@ BEGIN G.GetDesktopResolution(dw, dh);
 
   IF (wantScaleX # 0.0) & (wantScaleY # 0.0) THEN
     G.SetScale(wantScaleX, wantScaleY)
-  ELSIF ((fullscreen IN settings) OR (wantZoom >= 6/5 - 0.01)) &
-        ~(sharp IN settings) & (dw >= W * 6/5 - 0.01) THEN
+  ELSIF ((fullscreen IN settings) OR (wantZoom >= 6.0/5.0 - 0.01)) &
+        ~(sharp IN settings) & (FLT(dw) >= FLT(W) * 6.0/5.0 - 0.01) THEN
     G.SetScale(5/6, 1.0)
   END;