TypedTextDemo: updated to latest modules

Author: ivan-mogilko

demos/TypedTextDemo/Game.agf

@@ -1703,7 +1703,7 @@
         <Name>TypedText</Name>
         <Description>Module performs continious text typing over time, in typewriter style</Description>
         <Author>Ivan Mogilko</Author>
-        <Version>0.7.0</Version>
+        <Version>1.0.0</Version>
         <Key>990857917</Key>
         <IsHeader>False</IsHeader>
       </Script>
@@ -1721,7 +1721,7 @@
         <Name>TypedTextDrawing</Name>
         <Description>Module performs rendering of TypedText state to the provided DrawingSurface</Description>
         <Author>Ivan Mogilko</Author>
-        <Version>0.7.0</Version>
+        <Version>1.0.0</Version>
         <Key>1167863979</Key>
         <IsHeader>False</IsHeader>
       </Script>
@@ -1739,7 +1739,7 @@
         <Name>TypedTextHelper</Name>
         <Description>Collection of helper structs and functions for simplified TypedText usage</Description>
         <Author>Ivan Mogilko</Author>
-        <Version>0.7.0</Version>
+        <Version>1.0.0</Version>
         <Key>1687351331</Key>
         <IsHeader>False</IsHeader>
       </Script>

demos/TypedTextDemo/GlobalScript.asc

@@ -38,7 +38,12 @@ function on_mouse_click(MouseButton button) // called when a mouse button is cli
   }
   else if (button == eMouseLeft) 
   {
+#ifdef SCRIPT_API_v340
+    Room.ProcessClick(mouse.x,mouse.y, mouse.Mode);
+#endif
+#ifndef SCRIPT_API_v340
     ProcessClick(mouse.x,mouse.y, mouse.Mode);
+#endif
   }
   else // right-click, so cycle cursor
   {

demos/TypedTextDemo/PhylactereTypewriter.asc

@@ -5,6 +5,16 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef Phylactere_VERSION
+
+#ifdef SCRIPT_API_v350
+  #define SCREEN_WIDTH Screen.Width
+  #define SCREEN_HEIGHT Screen.Height
+#endif
+#ifndef SCRIPT_API_v350
+  #define SCREEN_WIDTH System.ViewportWidth
+  #define SCREEN_HEIGHT System.ViewportHeight
+#endif
+
 Phylactere_Param phylactere;
 export phylactere;
 
@@ -178,10 +188,10 @@ void SetupPhylactereTypewriter(Character* ch, String text, int delay)
 {
   phylactere_char = ch;
 
-  int max_width = System.ViewportWidth / 3;
-  int max_height = System.ViewportHeight / 6;
+  int max_width = SCREEN_WIDTH / 3;
+  int max_height = SCREEN_HEIGHT / 6;
   int min_pos = 16;
-  int max_pos = System.ViewportWidth - 16;
+  int max_pos = SCREEN_WIDTH - 16;
 
   FontType font = Game.SpeechFont;
   int text_width = GetTextWidth(text, font);

demos/TypedTextDemo/TypedText.asc

@@ -72,6 +72,11 @@ static String TypedTextUtils::SplitText(String text, int max_width, FontType fon
     }
   }
 
+  // Make sure there's at least 1 line always;
+  // this is bit inconsistent, but otherwise users may get confused
+  if (max_lines < 1)
+    max_lines = 1;
+
   String split_text = "";
   int line_count = 0;            // number of lines
   int line_start = 0;            // first character in line
@@ -110,7 +115,7 @@ static String TypedTextUtils::SplitText(String text, int max_width, FontType fon
     }
 
     // Move line end to just beyond the last found breakchar, if any
-    if (last_break_index >= line_start)
+    if ((line_end < text.Length) && (last_break_index >= line_start))
       line_end = last_break_index + 1;
 
     if (split_text.Length > 0)

demos/TypedTextDemo/TypedText.ash

@@ -2,7 +2,7 @@
 //
 // TERMS OF USE - TypedText MODULE
 //
-// Copyright (c) 2017-present Ivan Mogilko
+// Copyright (c) 2017-2024 Ivan Mogilko
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -41,7 +41,7 @@
 #ifndef __TYPEDTEXT_MODULE__
 #define __TYPEDTEXT_MODULE__
 
-#define TYPEDTEXT_VERSION_00_00_70_00
+#define TYPEDTEXT_VERSION_00_01_00_00
 
 /// Maximal allowed random sounds
 /// ( because pre-3.4.0 AGS does not support dynamic arrays in structs... :-( )

demos/TypedTextDemo/TypedTextDrawing.asc

@@ -1,3 +1,8 @@
+// Compatibility macros
+#ifndef SCRIPT_API_v350
+  #define eAlignCenter eAlignCentre
+#endif
+
 //===========================================================================
 //
 // TypedTextDrawing::PrecalcText
@@ -33,7 +38,7 @@ void PrecalcText(this TypedTextDrawing*)
         String s = this._full.Substring(line_start, line_end - line_start);
         //Display(">>> '%s'",s);
         int linewidth = GetTextWidth(s, this._font);
-        if (this._textAlign == eAlignCentre)
+        if (this._textAlign == eAlignCenter)
           this._lineX[line_count] = (this._width - linewidth) / 2;
         else
           this._lineX[line_count] = this._width - linewidth;
@@ -81,7 +86,7 @@ void RecalcDisplay(this TypedTextDrawing*)
   if (this._maxVisLines > TYPEDTEXTDRAWING_MAXLINES)
     this._maxVisLines = TYPEDTEXTDRAWING_MAXLINES;
 
-  if (this._textAlign == eAlignCentre)
+  if (this._textAlign == eAlignCenter)
     this._lineXDefault = this._width / 2;
   else if (this._textAlign == eAlignRight)
     this._lineXDefault = this._width - 1;
@@ -362,7 +367,7 @@ void DrawExplicitCaret(this TypedTextDrawing*, DrawingSurface *ds, int x, int y,
   }
 
   caret_y = y;
-  if (align == eAlignCentre)
+  if (align == eAlignCenter)
     caret_x = x - caret_w / 2;
   else if (align == eAlignRight)
     caret_x = x - caret_w;

demos/TypedTextDemo/TypedTextDrawing.ash

@@ -2,7 +2,7 @@
 //
 // TERMS OF USE - TypedTextDrawing MODULE
 //
-// Copyright (c) 2017-present Ivan Mogilko
+// Copyright (c) 2017-2024 Ivan Mogilko
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -42,7 +42,7 @@
 #error TypedTextDrawing requires TypedText module
 #endif
 
-#define TYPEDTEXTDRAWING_VERSION_00_00_70_00
+#define TYPEDTEXTDRAWING_VERSION_00_01_00_00
 
 // Maximal supported text lines
 #define TYPEDTEXTDRAWING_MAXLINES 32

demos/TypedTextDemo/TypedTextHelper.asc

@@ -400,7 +400,7 @@ static void TypewriterRunners::Cancel(int id)
 
 //===========================================================================
 //
-// Button::TypewriterPrint()
+// Button::Typewriter()
 //
 //===========================================================================
 int Typewriter(this Button*, String text, BlockingStyle bs, int preset)
@@ -414,7 +414,6 @@ int Typewriter(this Button*, String text, BlockingStyle bs, int preset)
   TTButtons[twi].CaretFlashOffTime = Presets[preset].CaretFlashOffTime;
   TTButtons[twi].CaretStyle = Presets[preset].CaretStyle;
   TTButtons[twi].CaretString = Presets[preset].CaretString;
-  TTButtons[twi].CaretStyle = Presets[preset].CaretStyle;
   TTButtons[twi].TextReadTime = Presets[preset].TextReadTime;
   TTButtons[twi].SetRandomTypeSounds(Presets[preset].GetTypeSoundArray(), Presets[preset].TypeSoundCount);
   TTButtons[twi].CaretSound = Presets[preset].CaretSound;
@@ -427,7 +426,7 @@ int Typewriter(this Button*, String text, BlockingStyle bs, int preset)
 
 //===========================================================================
 //
-// Label::TypewriterPrint()
+// Label::Typewriter()
 //
 //===========================================================================
 int Typewriter(this Label*, String text, BlockingStyle bs, int preset)
@@ -441,7 +440,6 @@ int Typewriter(this Label*, String text, BlockingStyle bs, int preset)
   TTLabels[twi].CaretFlashOffTime = Presets[preset].CaretFlashOffTime;
   TTLabels[twi].CaretStyle = Presets[preset].CaretStyle;
   TTLabels[twi].CaretString = Presets[preset].CaretString;
-  TTLabels[twi].CaretStyle = Presets[preset].CaretStyle;
   TTLabels[twi].TextReadTime = Presets[preset].TextReadTime;
   TTLabels[twi].SetRandomTypeSounds(Presets[preset].GetTypeSoundArray(), Presets[preset].TypeSoundCount);
   TTLabels[twi].CaretSound = Presets[preset].CaretSound;
@@ -454,22 +452,23 @@ int Typewriter(this Label*, String text, BlockingStyle bs, int preset)
 
 //===========================================================================
 //
-// TypewriteOver()
+// Overlay::Typewriter()
+// TypewriteOnOverlay()
 //
 //===========================================================================
 #ifver 3.4.0
-int Typewriter(static Overlay, int x, int y, int color, FontType font, String text, BlockingStyle bs, int preset)
+int Typewriter(static Overlay, int x, int y, int width, int color, FontType font, String text, BlockingStyle bs, int preset)
 #endif
 #ifnver 3.4.0
-int TypewriteOnOverlay(int x, int y, int color, FontType font, String text, BlockingStyle bs, int preset)
+int TypewriteOnOverlay(int x, int y, int width, int color, FontType font, String text, BlockingStyle bs, int preset)
 #endif
 {
   int twi = CreateTypewriter(eTWOverlay, bs, preset);
 
   // Start typewriter
   TTOverlays[twi].X = x;
   TTOverlays[twi].Y = y;
-  TTOverlays[twi].Width = System.ViewportWidth - x * 2;
+  TTOverlays[twi].Width = width;
   TTOverlays[twi].Color = color;
   TTOverlays[twi].Font = font;
   TTOverlays[twi].TypeDelayMin = Presets[preset].TypeDelayMin;
@@ -479,7 +478,6 @@ int TypewriteOnOverlay(int x, int y, int color, FontType font, String text, Bloc
   TTOverlays[twi].CaretFlashOffTime = Presets[preset].CaretFlashOffTime;
   TTOverlays[twi].CaretStyle = Presets[preset].CaretStyle;
   TTOverlays[twi].CaretString = Presets[preset].CaretString;
-  TTOverlays[twi].CaretStyle = Presets[preset].CaretStyle;
   TTOverlays[twi].TextReadTime = Presets[preset].TextReadTime;
   TTOverlays[twi].SetRandomTypeSounds(Presets[preset].GetTypeSoundArray(), Presets[preset].TypeSoundCount);
   TTOverlays[twi].CaretSound = Presets[preset].CaretSound;
@@ -493,12 +491,12 @@ int TypewriteOnOverlay(int x, int y, int color, FontType font, String text, Bloc
 
 //===========================================================================
 //
-// repeatedly_execute()
+// repeatedly_execute[_always]()
 //
 // Runs non-blocking typewriters
 //
 //===========================================================================
-function repeatedly_execute()
+function TYPEDTEXTHELPER_UPDATEFUNCTION()
 {
   int twi = 0;
   while (twi < TYPEDTEXTHELPER_MAXTYPEWRITERS)

demos/TypedTextDemo/TypedTextHelper.ash

@@ -2,7 +2,7 @@
 //
 // TERMS OF USE - TypedTextHelper MODULE
 //
-// Copyright (c) 2017-present Ivan Mogilko
+// Copyright (c) 2017-2024 Ivan Mogilko
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -34,7 +34,7 @@
 #error TypedTextHelper requires TypedText module
 #endif
 
-#define TYPEDTEXTHELPER_VERSION_00_00_70_00
+#define TYPEDTEXTHELPER_VERSION_00_01_00_00
 
 #ifver 3.4.0
   #ifdef SCRIPT_COMPAT_v321
@@ -45,6 +45,10 @@
   #define TYPEDTEXTHELPER_USEOLDOVERLAY
 #endif
 
+/// This defines when to run typedtext updates:
+/// may be "repeatedly_execute", "repeatedly_execute_always" or "late_repeatedly_execute_always"
+#define TYPEDTEXTHELPER_UPDATEFUNCTION repeatedly_execute_always
+
 /// Maximal supported presets, per each kind
 #define TYPEDTEXTHELPER_MAXPRESETS 8
 /// Maximal supported active typewriters (handled by TypedTextHelper module)
@@ -81,16 +85,16 @@ struct TypewriterRunners
 };
 
 /// Print TypedText as a text on button; returns typewriter ID
-import int Typewriter(this Button*, String text, BlockingStyle bs, int preset = 0);
+import int Typewriter(this Button*, String text, BlockingStyle bs = eBlock, int preset = 0);
 /// Print TypedText as a text on label; returns typewriter ID
-import int Typewriter(this Label*, String text, BlockingStyle bs, int preset = 0);
+import int Typewriter(this Label*, String text, BlockingStyle bs = eBlock, int preset = 0);
 #ifver 3.4.0
 /// Print TypedText as a text on created overlay; returns typewriter ID
-import int Typewriter(static Overlay, int x, int y, int color, FontType font, String text, BlockingStyle bs, int preset = 0);
-#endif
+import int Typewriter(static Overlay, int x, int y, int width, int color, FontType font, String text, BlockingStyle bs = eBlock, int preset = 0);
+#endif // 3.4.0
 #ifdef TYPEDTEXTHELPER_USEOLDOVERLAY
 /// Print TypedText as a text on created overlay; returns typewriter ID
-import int TypewriteOnOverlay(int x, int y, int color, FontType font, String text, BlockingStyle bs, int preset = 0);
-#endif
+import int TypewriteOnOverlay(int x, int y, int width, int color, FontType font, String text, BlockingStyle bs = eBlock, int preset = 0);
+#endif // TYPEDTEXTHELPER_USEOLDOVERLAY
 
 #endif  // __TYPEDTEXTHELPER_MODULE__

demos/TypedTextDemo/room1.asc

@@ -1,5 +1,10 @@
 // room script file
 
+// Compatibility macros
+#ifndef SCRIPT_API_v350
+  #define eAlignCenter eAlignCentre
+#endif
+
 TypedTextDrawing ttdraw;
 DynamicSprite *papersprite;
 int paper_original_pos;
@@ -29,7 +34,7 @@ void StartTypewriter()
   ttdraw.Font = eFontFont3;
   ttdraw.BkgColor = Game.GetColorFromRGB(255, 255, 255);
   ttdraw.TextColor = Game.GetColorFromRGB(66, 44, 123);
-  ttdraw.TextAlign = eAlignCentre;
+  ttdraw.TextAlign = eAlignCenter;
   ttdraw.CaretSprite = 29;
   ttdraw.TypeDelayMin = 4;
   ttdraw.TypeDelayMax = 7;