Index: MUSHclient.cpp
===================================================================
RCS file: /cvs/mushclient/MUSHclient.cpp,v
retrieving revision 1.84
diff -c -r1.84 MUSHclient.cpp
*** MUSHclient.cpp	21 Feb 2008 22:06:01 -0000	1.84
--- MUSHclient.cpp	27 May 2008 01:48:33 -0000
***************
*** 1407,1412 ****
--- 1407,1415 ----
  
  BOOL CMUSHclientApp::I18N_Setup (void)  // internationalization
    {
+ long iScreenX = GetSystemMetrics (SM_CXSCREEN);
+ long iScreenY = GetSystemMetrics (SM_CYSCREEN);
+ bool bSmallScreen = (iScreenX < 1024) || (iScreenY < 768);
  
    m_Translator_Lua = NULL;
  
***************
*** 1430,1435 ****
--- 1433,1441 ----
    // english resource file
    CString m_strEnglishResourceFile = m_strTranslatorFile + "EN.dll";
  
+   if (bSmallScreen)
+     m_strEnglishResourceFile = m_strTranslatorFile + "EN_small.dll";
+ 
    // locale-specific file
    m_strTranslatorFile += m_strLocale;     // eg. EN
  
***************
*** 1438,1443 ****
--- 1444,1452 ----
  
    // translator file is Lua
    m_strTranslatorFile += ".lua";
+ 
+   if (bSmallScreen)
+     m_strResourceFile += "_small";
  
    // resource file is DLL
    m_strResourceFile += ".dll";
Index: MUSHclient.dsp
===================================================================
RCS file: /cvs/mushclient/MUSHclient.dsp,v
retrieving revision 1.96
diff -c -r1.96 MUSHclient.dsp
*** MUSHclient.dsp	13 Jun 2007 06:16:04 -0000	1.96
--- MUSHclient.dsp	27 May 2008 01:48:33 -0000
***************
*** 1471,1487 ****
  # End Source File
  # End Target
  # End Project
! # Section MUSHclient : {00000000-0000-0000-0000-000000000000}
! # 	1:22:CG_IDR_POPUP_SEND_VIEW:124
! # End Section
! # Section MUSHclient : {52A03A14-D2CC-0056-A8D2-560020D55600}
! # 	1:21:CG_IDR_POPUP_MUSHVIEW:125
! # End Section
! # Section MUSHclient : {00000000-000C-0000-0C00-00004944445F}
! # 	1:26:CG_IDR_POPUP_ACTIVITY_VIEW:127
! # End Section
! # Section MUSHclient : {00000000-0001-0000-0000-000000000000}
! # 	1:23:CG_IDR_POPUP_MAIN_FRAME:126
  # End Section
  # Section MUSHclient : {F3B13065-16CC-11D0-B7D0-00A0247B3BFD}
  # 	0:8:TipDlg.h:D:\SOURCE\MUSHclient\TipDlg.h
--- 1471,1488 ----
  # End Source File
  # End Target
  # End Project
! # Section MUSHclient : {F3B1306C-16CC-11D0-B7D0-00A0247B3BFD}
! # 	0:8:Splash.h:D:\SOURCE\MUSHclient\Splash.h
! # 	0:10:Splash.cpp:D:\SOURCE\MUSHclient\Splash.cpp
! # 	1:10:IDB_SPLASH:102
! # 	2:10:ResHdrName:resource.h
! # 	2:11:ProjHdrName:stdafx.h
! # 	2:10:WrapperDef:_SPLASH_SCRN_
! # 	2:12:SplClassName:CSplashWnd
! # 	2:21:SplashScreenInsertKey:4.0
! # 	2:10:HeaderName:Splash.h
! # 	2:10:ImplemName:Splash.cpp
! # 	2:7:BmpID16:IDB_SPLASH
  # End Section
  # Section MUSHclient : {F3B13065-16CC-11D0-B7D0-00A0247B3BFD}
  # 	0:8:TipDlg.h:D:\SOURCE\MUSHclient\TipDlg.h
***************
*** 1508,1523 ****
  # 	2:18:CG_IDS_FILE_ABSENT:CG_IDS_FILE_ABSENT
  # 	2:10:TipDlg.cpp:TipDlg.cpp
  # End Section
! # Section MUSHclient : {F3B1306C-16CC-11D0-B7D0-00A0247B3BFD}
! # 	0:8:Splash.h:D:\SOURCE\MUSHclient\Splash.h
! # 	0:10:Splash.cpp:D:\SOURCE\MUSHclient\Splash.cpp
! # 	1:10:IDB_SPLASH:102
! # 	2:10:ResHdrName:resource.h
! # 	2:11:ProjHdrName:stdafx.h
! # 	2:10:WrapperDef:_SPLASH_SCRN_
! # 	2:12:SplClassName:CSplashWnd
! # 	2:21:SplashScreenInsertKey:4.0
! # 	2:10:HeaderName:Splash.h
! # 	2:10:ImplemName:Splash.cpp
! # 	2:7:BmpID16:IDB_SPLASH
  # End Section
--- 1509,1523 ----
  # 	2:18:CG_IDS_FILE_ABSENT:CG_IDS_FILE_ABSENT
  # 	2:10:TipDlg.cpp:TipDlg.cpp
  # End Section
! # Section MUSHclient : {00000000-0000-0000-0000-000000000000}
! # 	1:22:CG_IDR_POPUP_SEND_VIEW:124
! # End Section
! # Section MUSHclient : {52A03A14-D2CC-0056-A8D2-560020D55600}
! # 	1:21:CG_IDR_POPUP_MUSHVIEW:125
! # End Section
! # Section MUSHclient : {00000000-000C-0000-0C00-00004944445F}
! # 	1:26:CG_IDR_POPUP_ACTIVITY_VIEW:127
! # End Section
! # Section MUSHclient : {00000000-0001-0000-0000-000000000000}
! # 	1:23:CG_IDR_POPUP_MAIN_FRAME:126
  # End Section
Index: MUSHclient.rc
===================================================================
RCS file: /cvs/mushclient/MUSHclient.rc,v
retrieving revision 1.215
diff -c -r1.215 MUSHclient.rc
*** MUSHclient.rc	29 Apr 2008 00:19:18 -0000	1.215
--- MUSHclient.rc	27 May 2008 01:48:33 -0000
***************
*** 56,63 ****
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,24,0
!  PRODUCTVERSION 4,0,24,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
--- 56,63 ----
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,25,0
!  PRODUCTVERSION 4,0,25,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
***************
*** 75,88 ****
              VALUE "Comments", "MUSHclient - a client program for playing MUD games\0"
              VALUE "CompanyName", "Gammon Software Solutions\0"
              VALUE "FileDescription", "MUSHclient\0"
!             VALUE "FileVersion", "4.24\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2008 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.24\0"
              VALUE "SpecialBuild", "\0"
          END
      END
--- 75,88 ----
              VALUE "Comments", "MUSHclient - a client program for playing MUD games\0"
              VALUE "CompanyName", "Gammon Software Solutions\0"
              VALUE "FileDescription", "MUSHclient\0"
!             VALUE "FileVersion", "4.25\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2008 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.25\0"
              VALUE "SpecialBuild", "\0"
          END
      END
Index: doc.h
===================================================================
RCS file: /cvs/mushclient/doc.h,v
retrieving revision 1.234
diff -c -r1.234 doc.h
*** doc.h	29 Apr 2008 00:19:18 -0000	1.234
--- doc.h	27 May 2008 01:48:34 -0000
***************
*** 21,28 ****
  
  // New versions - things to change
  
! #define THISVERSION 424                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.24";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
--- 21,28 ----
  
  // New versions - things to change
  
! #define THISVERSION 425                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.25";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
Index: locale_notes.txt
===================================================================
RCS file: /cvs/mushclient/locale_notes.txt,v
retrieving revision 1.1
diff -c -r1.1 locale_notes.txt
*** locale_notes.txt	18 Jun 2007 00:08:41 -0000	1.1
--- locale_notes.txt	27 May 2008 01:48:34 -0000
***************
*** 3,8 ****
--- 3,9 ----
  
  Author: Nick Gammon
  Date:   18th June 2007
+ Amended: 27th May 2008 to mention large/small monitor handling
  
  
  In the "locale" directory - which is a subdirectory under where the MUSHclient.exe program is stored, you should find the following files in the standard MUSHclient distribution:
***************
*** 11,17 ****
  
  * Localize_template.lua  --> template for creating a new translation file
  
! * en.dll  --> resources for MUSHclient - in English
  
  * count_locale_usage.lua  --> Lua script for counting which messages need translating the most
  
--- 12,20 ----
  
  * Localize_template.lua  --> template for creating a new translation file
  
! * en.dll  --> resources for MUSHclient - in English (for screen resolution 1024 x 768 or larger)
! 
! * en_small.dll  --> resources for MUSHclient - in English (for small screen resolutions)
  
  * count_locale_usage.lua  --> Lua script for counting which messages need translating the most
  
***************
*** 29,34 ****
--- 32,40 ----
  If you are planning to localize to another language, you would take these steps. Let us take French as an example, which has a locale code of FR.
  
  1. Copy en.dll as fr.dll (make a copy, rename the copy fr.dll)
+ 
+ NOTE: You now have two resource files (en.dll and en_small.dll). One is designed for small monitors and one for larger ones. Use the appropriate file depending on the size monitor you plan to use.
+ 
  
  2. Copy Localize_template.lua as fr.lua (make a copy, rename the copy fr.lua)
  
Index: lua_methods.cpp
===================================================================
RCS file: /cvs/mushclient/lua_methods.cpp,v
retrieving revision 1.79
diff -c -r1.79 lua_methods.cpp
*** lua_methods.cpp	10 Jan 2008 01:24:53 -0000	1.79
--- lua_methods.cpp	27 May 2008 01:48:34 -0000
***************
*** 97,108 ****
  // helper function for pushing results returned by normal MUSHclient methods
  // (stored in a variant)
  
! int pushVariant (lua_State *L, COleVariant & v)
    {
    switch (v.vt)
      {
      case VT_BSTR:
        lua_pushstring (L, CString (v.bstrVal));
        break;
      case VT_I2:
        lua_pushnumber (L, v.iVal);
--- 97,110 ----
  // helper function for pushing results returned by normal MUSHclient methods
  // (stored in a variant)
  
! int pushVariant (lua_State *L, VARIANT & v)
    {
    switch (v.vt)
      {
      case VT_BSTR:
        lua_pushstring (L, CString (v.bstrVal));
+       SysFreeString (v.bstrVal);
+       v.vt = VT_NULL;
        break;
      case VT_I2:
        lua_pushnumber (L, v.iVal);
***************
*** 157,164 ****
          index [0] = i;
          index [1] = 0;
          sa.GetElement(index, &val);
!         COleVariant element (val);
!         pushVariant (L, element);   // recurse to push the element value
          lua_rawseti(L, -2, i + extra);  // make 1-relative
          }   // end of doing each row
        luaL_setn (L, -1, i + extra - 1);   // set table size now
--- 159,165 ----
          index [0] = i;
          index [1] = 0;
          sa.GetElement(index, &val);
!         pushVariant (L, val);   // recurse to push the element value
          lua_rawseti(L, -2, i + extra);  // make 1-relative
          }   // end of doing each row
        luaL_setn (L, -1, i + extra - 1);   // set table size now
***************
*** 344,350 ****
  //----------------------------------------
  static int L_AcceleratorList (lua_State *L)
    {
!   COleVariant v = doc (L)->AcceleratorList ();
    return pushVariant (L, v);
    } // end of L_AcceleratorList
  
--- 345,351 ----
  //----------------------------------------
  static int L_AcceleratorList (lua_State *L)
    {
!   VARIANT v = doc (L)->AcceleratorList ();
    return pushVariant (L, v);
    } // end of L_AcceleratorList
  
***************
*** 643,649 ****
  static int L_ArrayExport (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayExport (
              my_checkstring (L, 1),   // Name
              my_optstring (L, 2, ",") // Delimiter
              );
--- 644,650 ----
  static int L_ArrayExport (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayExport (
              my_checkstring (L, 1),   // Name
              my_optstring (L, 2, ",") // Delimiter
              );
***************
*** 657,663 ****
  static int L_ArrayExportKeys (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayExportKeys (
              my_checkstring (L, 1),   // Name
              my_optstring (L, 2, ",") // Delimiter
              );
--- 658,664 ----
  static int L_ArrayExportKeys (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayExportKeys (
              my_checkstring (L, 1),   // Name
              my_optstring (L, 2, ",") // Delimiter
              );
***************
*** 671,677 ****
  static int L_ArrayGet (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayGet (
              my_checkstring (L, 1),   // Name
              my_checkstring (L, 2)    // Key
              );
--- 672,678 ----
  static int L_ArrayGet (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayGet (
              my_checkstring (L, 1),   // Name
              my_checkstring (L, 2)    // Key
              );
***************
*** 685,691 ****
  static int L_ArrayGetFirstKey (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayGetFirstKey (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayGetFirstKey
  
--- 686,692 ----
  static int L_ArrayGetFirstKey (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayGetFirstKey (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayGetFirstKey
  
***************
*** 696,702 ****
  static int L_ArrayGetLastKey (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayGetLastKey (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayGetLastKey
  
--- 697,703 ----
  static int L_ArrayGetLastKey (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayGetLastKey (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayGetLastKey
  
***************
*** 787,793 ****
  //----------------------------------------
  static int L_ArrayListAll (lua_State *L)
    {
!   COleVariant v = doc (L)->ArrayListAll ();
    return pushVariant (L, v);
    } // end of L_ArrayListAll
  
--- 788,794 ----
  //----------------------------------------
  static int L_ArrayListAll (lua_State *L)
    {
!   VARIANT v = doc (L)->ArrayListAll ();
    return pushVariant (L, v);
    } // end of L_ArrayListAll
  
***************
*** 798,804 ****
  static int L_ArrayListKeys (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayListKeys (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayListKeys
  
--- 799,805 ----
  static int L_ArrayListKeys (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayListKeys (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayListKeys
  
***************
*** 809,815 ****
  static int L_ArrayListValues (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->ArrayListValues (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayListValues
  
--- 810,816 ----
  static int L_ArrayListValues (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->ArrayListValues (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_ArrayListValues
  
***************
*** 869,875 ****
  static int L_Base64Decode (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->Base64Decode (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_Base64Decode
  
--- 870,876 ----
  static int L_Base64Decode (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->Base64Decode (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_Base64Decode
  
***************
*** 880,886 ****
  static int L_Base64Encode (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->Base64Encode (
          my_checkstring (L, 1),  // Text
          optboolean (L, 2, 0)     // MultiLine
          );
--- 881,887 ----
  static int L_Base64Encode (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->Base64Encode (
          my_checkstring (L, 1),  // Text
          optboolean (L, 2, 0)     // MultiLine
          );
***************
*** 1368,1374 ****
  static int L_Debug (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->Debug (my_optstring (L, 1, ""));
    return pushVariant (L, v);  // number of result fields
    } // end of L_Debug
  
--- 1369,1375 ----
  static int L_Debug (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->Debug (my_optstring (L, 1, ""));
    return pushVariant (L, v);  // number of result fields
    } // end of L_Debug
  
***************
*** 1872,1878 ****
  //----------------------------------------
  static int L_GenerateName (lua_State *L)
    {
!   COleVariant v = doc (L)->GenerateName ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GenerateName
  
--- 1873,1879 ----
  //----------------------------------------
  static int L_GenerateName (lua_State *L)
    {
!   VARIANT v = doc (L)->GenerateName ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GenerateName
  
***************
*** 1887,1897 ****
    {
    CMUSHclientDoc *pDoc = doc (L);
  
!   COleVariant MatchText, 
!               ResponseText, 
!               Parameter, 
!               Flags, 
!               ScriptName;
  
    long result = pDoc->GetAlias(my_checkstring (L, 1),  // name
                                    &MatchText, 
--- 1888,1898 ----
    {
    CMUSHclientDoc *pDoc = doc (L);
  
!   VARIANT MatchText, 
!           ResponseText, 
!           Parameter, 
!           Flags, 
!           ScriptName;
  
    long result = pDoc->GetAlias(my_checkstring (L, 1),  // name
                                    &MatchText, 
***************
*** 1915,1921 ****
  static int L_GetAliasInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetAliasInfo (
        my_checkstring (L, 1),    // Name
        my_checknumber (L, 2)     // Type
      );
--- 1916,1922 ----
  static int L_GetAliasInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetAliasInfo (
        my_checkstring (L, 1),    // Name
        my_checknumber (L, 2)     // Type
      );
***************
*** 1928,1934 ****
  //----------------------------------------
  static int L_GetAliasList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetAliasList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetAliasList
  
--- 1929,1935 ----
  //----------------------------------------
  static int L_GetAliasList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetAliasList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetAliasList
  
***************
*** 1939,1945 ****
  static int L_GetAliasOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetAliasOption (
        my_checkstring (L, 1),    // Name
        my_checkstring (L, 2)     // Option name
      );
--- 1940,1946 ----
  static int L_GetAliasOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetAliasOption (
        my_checkstring (L, 1),    // Name
        my_checkstring (L, 2)     // Option name
      );
***************
*** 1953,1959 ****
  static int L_GetAliasWildcard (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetAliasWildcard (
        my_checkstring (L, 1),    // Name
        my_checkstring (L, 2)     // Wildcard name
      );
--- 1954,1960 ----
  static int L_GetAliasWildcard (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetAliasWildcard (
        my_checkstring (L, 1),    // Name
        my_checkstring (L, 2)     // Wildcard name
      );
***************
*** 1967,1973 ****
  static int L_GetAlphaOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetAlphaOption (
        my_checkstring (L, 1) // Name
      );
    return pushVariant (L, v);  // number of result fields
--- 1968,1974 ----
  static int L_GetAlphaOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetAlphaOption (
        my_checkstring (L, 1) // Name
      );
    return pushVariant (L, v);  // number of result fields
***************
*** 1980,1986 ****
  static int L_GetAlphaOptionList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetAlphaOptionList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetAlphaOptionList
  
--- 1981,1987 ----
  static int L_GetAlphaOptionList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetAlphaOptionList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetAlphaOptionList
  
***************
*** 1991,1997 ****
  static int L_GetChatInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetChatInfo (
        my_checknumber (L, 1),    // ChatID 
        my_checknumber (L, 2)     // InfoType
      );
--- 1992,1998 ----
  static int L_GetChatInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetChatInfo (
        my_checknumber (L, 1),    // ChatID 
        my_checknumber (L, 2)     // InfoType
      );
***************
*** 2004,2010 ****
  //----------------------------------------
  static int L_GetChatList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetChatList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetChatList
  
--- 2005,2011 ----
  //----------------------------------------
  static int L_GetChatList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetChatList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetChatList
  
***************
*** 2015,2021 ****
  static int L_GetChatOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetChatOption (
        my_checknumber (L, 1),    // ChatID 
        my_checkstring (L, 2)     // OptionName
      );
--- 2016,2022 ----
  static int L_GetChatOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetChatOption (
        my_checknumber (L, 1),    // ChatID 
        my_checkstring (L, 2)     // OptionName
      );
***************
*** 2049,2055 ****
  static int L_GetCommandList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetCommandList (
        my_checknumber (L, 1) // Count
      );
    return pushVariant (L, v);  // number of result fields
--- 2050,2056 ----
  static int L_GetCommandList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetCommandList (
        my_checknumber (L, 1) // Count
      );
    return pushVariant (L, v);  // number of result fields
***************
*** 2072,2078 ****
  static int L_GetCurrentValue (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetCurrentValue (
              my_checkstring (L, 1)   // OptionName
              );
    return pushVariant (L, v);
--- 2073,2079 ----
  static int L_GetCurrentValue (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetCurrentValue (
              my_checkstring (L, 1)   // OptionName
              );
    return pushVariant (L, v);
***************
*** 2098,2104 ****
  static int L_GetDefaultValue (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetDefaultValue (
              my_checkstring (L, 1)   // OptionName
              );
    return pushVariant (L, v);
--- 2099,2105 ----
  static int L_GetDefaultValue (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetDefaultValue (
              my_checkstring (L, 1)   // OptionName
              );
    return pushVariant (L, v);
***************
*** 2139,2145 ****
  //----------------------------------------
  static int L_GetGlobalOption (lua_State *L)
    {
!   COleVariant v = doc (L)->GetGlobalOption (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_GetGlobalOption
  
--- 2140,2146 ----
  //----------------------------------------
  static int L_GetGlobalOption (lua_State *L)
    {
!   VARIANT v = doc (L)->GetGlobalOption (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_GetGlobalOption
  
***************
*** 2149,2155 ****
  //----------------------------------------
  static int L_GetGlobalOptionList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetGlobalOptionList ();
    return pushVariant (L, v);
    } // end of L_GetGlobalOptionList
  
--- 2150,2156 ----
  //----------------------------------------
  static int L_GetGlobalOptionList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetGlobalOptionList ();
    return pushVariant (L, v);
    } // end of L_GetGlobalOptionList
  
***************
*** 2159,2165 ****
  static int L_GetHostAddress (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetHostAddress (
              my_checkstring (L, 1)   // HostName
              );
    return pushVariant (L, v);
--- 2160,2166 ----
  static int L_GetHostAddress (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetHostAddress (
              my_checkstring (L, 1)   // HostName
              );
    return pushVariant (L, v);
***************
*** 2183,2189 ****
  static int L_GetInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetInfo (
              my_checknumber (L, 1)   // InfoType
              );
    return pushVariant (L, v);
--- 2184,2190 ----
  static int L_GetInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetInfo (
              my_checknumber (L, 1)   // InfoType
              );
    return pushVariant (L, v);
***************
*** 2195,2201 ****
  //----------------------------------------
  static int L_GetInternalCommandsList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetInternalCommandsList ();
    return pushVariant (L, v);
    } // end of L_GetInternalCommandsList
  
--- 2196,2202 ----
  //----------------------------------------
  static int L_GetInternalCommandsList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetInternalCommandsList ();
    return pushVariant (L, v);
    } // end of L_GetInternalCommandsList
  
***************
*** 2252,2258 ****
      }     // end of returning a table
  
    // normal behaviour
!   COleVariant v = pDoc->GetLineInfo (iLine, iType);
    return pushVariant (L, v);
    } // end of L_GetLineInfo
  
--- 2253,2259 ----
      }     // end of returning a table
  
    // normal behaviour
!   VARIANT v = pDoc->GetLineInfo (iLine, iType);
    return pushVariant (L, v);
    } // end of L_GetLineInfo
  
***************
*** 2273,2279 ****
  static int L_GetLoadedValue (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetLoadedValue (
              my_checkstring (L, 1)   // OptionName
              );
    return pushVariant (L, v);
--- 2274,2280 ----
  static int L_GetLoadedValue (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetLoadedValue (
              my_checkstring (L, 1)   // OptionName
              );
    return pushVariant (L, v);
***************
*** 2415,2421 ****
  static int L_GetMappingItem (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetMappingItem (
              my_checknumber (L, 1)   // Item
              );
    return pushVariant (L, v);
--- 2416,2422 ----
  static int L_GetMappingItem (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetMappingItem (
              my_checknumber (L, 1)   // Item
              );
    return pushVariant (L, v);
***************
*** 2427,2433 ****
  //----------------------------------------
  static int L_GetMappingString (lua_State *L)
    {
!   COleVariant v = doc (L)->GetMappingString ();
    return pushVariant (L, v);
    } // end of L_GetMappingString
  
--- 2428,2434 ----
  //----------------------------------------
  static int L_GetMappingString (lua_State *L)
    {
!   VARIANT v = doc (L)->GetMappingString ();
    return pushVariant (L, v);
    } // end of L_GetMappingString
  
***************
*** 2447,2453 ****
  //----------------------------------------
  static int L_GetNotepadList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetNotepadList (optboolean (L, 1, 0));
    return pushVariant (L, v);
    } // end of L_GetNotepadList
  
--- 2448,2454 ----
  //----------------------------------------
  static int L_GetNotepadList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetNotepadList (optboolean (L, 1, 0));
    return pushVariant (L, v);
    } // end of L_GetNotepadList
  
***************
*** 2497,2503 ****
  //----------------------------------------
  static int L_GetOptionList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetOptionList ();
    return pushVariant (L, v);
    } // end of L_GetOptionList
  
--- 2498,2504 ----
  //----------------------------------------
  static int L_GetOptionList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetOptionList ();
    return pushVariant (L, v);
    } // end of L_GetOptionList
  
***************
*** 2518,2524 ****
  static int L_GetPluginAliasInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginAliasInfo (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Name
        my_checknumber (L, 3)     // Type
--- 2519,2525 ----
  static int L_GetPluginAliasInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginAliasInfo (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Name
        my_checknumber (L, 3)     // Type
***************
*** 2533,2539 ****
  static int L_GetPluginAliasList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginAliasList (
        my_checkstring (L, 1)    // PluginID
      );
    return pushVariant (L, v);  // number of result fields
--- 2534,2540 ----
  static int L_GetPluginAliasList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginAliasList (
        my_checkstring (L, 1)    // PluginID
      );
    return pushVariant (L, v);  // number of result fields
***************
*** 2546,2552 ****
  static int L_GetPluginAliasOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginAliasOption (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Alias Name
        my_checkstring (L, 3)     // Option Name
--- 2547,2553 ----
  static int L_GetPluginAliasOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginAliasOption (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Alias Name
        my_checkstring (L, 3)     // Option Name
***************
*** 2572,2578 ****
  static int L_GetPluginInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginInfo (
        my_checkstring (L, 1),    // PluginID
        my_checknumber (L, 2)     // Type
      );
--- 2573,2579 ----
  static int L_GetPluginInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginInfo (
        my_checkstring (L, 1),    // PluginID
        my_checknumber (L, 2)     // Type
      );
***************
*** 2585,2591 ****
  //----------------------------------------
  static int L_GetPluginList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetPluginList ();
    return pushVariant (L, v);
    } // end of L_GetPluginList
  
--- 2586,2592 ----
  //----------------------------------------
  static int L_GetPluginList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetPluginList ();
    return pushVariant (L, v);
    } // end of L_GetPluginList
  
***************
*** 2606,2612 ****
  static int L_GetPluginTimerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginTimerInfo (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Name
        my_checknumber (L, 3)     // Type
--- 2607,2613 ----
  static int L_GetPluginTimerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginTimerInfo (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Name
        my_checknumber (L, 3)     // Type
***************
*** 2621,2627 ****
  static int L_GetPluginTimerList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginTimerList (
        my_checkstring (L, 1)    // PluginID
      );
    return pushVariant (L, v);  // number of result fields
--- 2622,2628 ----
  static int L_GetPluginTimerList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginTimerList (
        my_checkstring (L, 1)    // PluginID
      );
    return pushVariant (L, v);  // number of result fields
***************
*** 2634,2640 ****
  static int L_GetPluginTimerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginTimerOption (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Timer Name
        my_checkstring (L, 3)     // Option Name
--- 2635,2641 ----
  static int L_GetPluginTimerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginTimerOption (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Timer Name
        my_checkstring (L, 3)     // Option Name
***************
*** 2649,2655 ****
  static int L_GetPluginTriggerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginTriggerInfo (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Name
        my_checknumber (L, 3)     // Type
--- 2650,2656 ----
  static int L_GetPluginTriggerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginTriggerInfo (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Name
        my_checknumber (L, 3)     // Type
***************
*** 2664,2670 ****
  static int L_GetPluginTriggerList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginTriggerList (
        my_checkstring (L, 1)    // PluginID
      );
    return pushVariant (L, v);  // number of result fields
--- 2665,2671 ----
  static int L_GetPluginTriggerList (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginTriggerList (
        my_checkstring (L, 1)    // PluginID
      );
    return pushVariant (L, v);  // number of result fields
***************
*** 2677,2683 ****
  static int L_GetPluginTriggerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginTriggerOption (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Trigger Name
        my_checkstring (L, 3)     // Option Name
--- 2678,2684 ----
  static int L_GetPluginTriggerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginTriggerOption (
        my_checkstring (L, 1),    // PluginID
        my_checkstring (L, 2),    // Trigger Name
        my_checkstring (L, 3)     // Option Name
***************
*** 2692,2698 ****
  static int L_GetPluginVariable (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetPluginVariable (
        my_checkstring (L, 1),   // PluginID
        my_checkstring (L, 2)    // VariableName
      );
--- 2693,2699 ----
  static int L_GetPluginVariable (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetPluginVariable (
        my_checkstring (L, 1),   // PluginID
        my_checkstring (L, 2)    // VariableName
      );
***************
*** 2738,2744 ****
  //----------------------------------------
  static int L_GetQueue (lua_State *L)
    {
!   COleVariant v = doc (L)->GetQueue ();
    return pushVariant (L, v);
    } // end of L_GetQueue
  
--- 2739,2745 ----
  //----------------------------------------
  static int L_GetQueue (lua_State *L)
    {
!   VARIANT v = doc (L)->GetQueue ();
    return pushVariant (L, v);
    } // end of L_GetQueue
  
***************
*** 2945,2951 ****
          DoStyle (L, pDoc, pLine, iStyleNumber, strText);
        else
          {   // a single type, use our usual routine to get it
!         COleVariant v = pDoc->GetStyleInfo (iLine, iStyleNumber, iType); 
          pushVariant (L, v);
          }
  
--- 2946,2952 ----
          DoStyle (L, pDoc, pLine, iStyleNumber, strText);
        else
          {   // a single type, use our usual routine to get it
!         VARIANT v = pDoc->GetStyleInfo (iLine, iStyleNumber, iType); 
          pushVariant (L, v);
          }
  
***************
*** 2964,2970 ****
      }
  
    // here for usual behaviour
!   COleVariant v = pDoc->GetStyleInfo (iLine, iStyleNumber, iType); 
    return pushVariant (L, v);
    } // end of L_GetStyleInfo
  
--- 2965,2971 ----
      }
  
    // here for usual behaviour
!   VARIANT v = pDoc->GetStyleInfo (iLine, iStyleNumber, iType); 
    return pushVariant (L, v);
    } // end of L_GetStyleInfo
  
***************
*** 2995,3006 ****
    {
    CMUSHclientDoc *pDoc = doc (L);
  
!   COleVariant Hour, 
!               Minute, 
!               Second, 
!               ResponseText, 
!               Flags, 
!               ScriptName;
  
    long result = pDoc->GetTimer(my_checkstring (L, 1),  // name
                                    &Hour, 
--- 2996,3007 ----
    {
    CMUSHclientDoc *pDoc = doc (L);
  
!   VARIANT Hour, 
!           Minute, 
!           Second, 
!           ResponseText, 
!           Flags, 
!           ScriptName;
  
    long result = pDoc->GetTimer(my_checkstring (L, 1),  // name
                                    &Hour, 
***************
*** 3028,3034 ****
  static int L_GetTimerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetTimerInfo (
        my_checkstring (L, 1),    // TimerName
        my_checknumber (L, 2)     // Type
      );
--- 3029,3035 ----
  static int L_GetTimerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetTimerInfo (
        my_checkstring (L, 1),    // TimerName
        my_checknumber (L, 2)     // Type
      );
***************
*** 3041,3047 ****
  //----------------------------------------
  static int L_GetTimerList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetTimerList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetTimerList
  
--- 3042,3048 ----
  //----------------------------------------
  static int L_GetTimerList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetTimerList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetTimerList
  
***************
*** 3052,3058 ****
  static int L_GetTimerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetTimerOption (
        my_checkstring (L, 1),    // TimerName
        my_checkstring (L, 2)     // Option name
      );
--- 3053,3059 ----
  static int L_GetTimerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetTimerOption (
        my_checkstring (L, 1),    // TimerName
        my_checkstring (L, 2)     // Option name
      );
***************
*** 3067,3079 ****
    {
    CMUSHclientDoc *pDoc = doc (L);
  
!   COleVariant MatchText, 
!               ResponseText, 
!               Flags, 
!               Colour, 
!               Wildcard, 
!               SoundFileName, 
!               ScriptName;
  
    long result = pDoc->GetTrigger(my_checkstring (L, 1),  // name
                                    &MatchText, 
--- 3068,3080 ----
    {
    CMUSHclientDoc *pDoc = doc (L);
  
!   VARIANT MatchText, 
!           ResponseText, 
!           Flags, 
!           Colour, 
!           Wildcard, 
!           SoundFileName, 
!           ScriptName;
  
    long result = pDoc->GetTrigger(my_checkstring (L, 1),  // name
                                    &MatchText, 
***************
*** 3103,3109 ****
  static int L_GetTriggerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetTriggerInfo (
        my_checkstring (L, 1),    // TriggerName
        my_checknumber (L, 2)     // Type
      );
--- 3104,3110 ----
  static int L_GetTriggerInfo (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetTriggerInfo (
        my_checkstring (L, 1),    // TriggerName
        my_checknumber (L, 2)     // Type
      );
***************
*** 3116,3122 ****
  //----------------------------------------
  static int L_GetTriggerList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetTriggerList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetTriggerList
  
--- 3117,3123 ----
  //----------------------------------------
  static int L_GetTriggerList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetTriggerList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetTriggerList
  
***************
*** 3127,3133 ****
  static int L_GetTriggerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetTriggerOption (
        my_checkstring (L, 1),    // TriggerName
        my_checkstring (L, 2)     // Option name
      );
--- 3128,3134 ----
  static int L_GetTriggerOption (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetTriggerOption (
        my_checkstring (L, 1),    // TriggerName
        my_checkstring (L, 2)     // Option name
      );
***************
*** 3141,3147 ****
  static int L_GetTriggerWildcard (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetTriggerWildcard (
        my_checkstring (L, 1),    // Name
        my_checkstring (L, 2)     // Wildcard name
      );
--- 3142,3148 ----
  static int L_GetTriggerWildcard (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetTriggerWildcard (
        my_checkstring (L, 1),    // Name
        my_checkstring (L, 2)     // Wildcard name
      );
***************
*** 3189,3198 ****
  static int L_GetVariable (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->GetVariable (
        my_checkstring (L, 1)    // VariableName
      );
!   return pushVariant (L, v);  // number of result fields
    } // end of L_GetVariable
  
  
--- 3190,3199 ----
  static int L_GetVariable (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->GetVariable (
        my_checkstring (L, 1)    // VariableName
      );
!   return pushVariant (L, v);  // number of result fields 
    } // end of L_GetVariable
  
  
***************
*** 3277,3283 ****
  //----------------------------------------
  static int L_GetWorldIdList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetWorldIdList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetWorldIdList
  
--- 3278,3284 ----
  //----------------------------------------
  static int L_GetWorldIdList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetWorldIdList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetWorldIdList
  
***************
*** 3287,3293 ****
  //----------------------------------------
  static int L_GetWorldList (lua_State *L)
    {
!   COleVariant v = doc (L)->GetWorldList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetWorldList
  
--- 3288,3294 ----
  //----------------------------------------
  static int L_GetWorldList (lua_State *L)
    {
!   VARIANT v = doc (L)->GetWorldList ();
    return pushVariant (L, v);  // number of result fields
    } // end of L_GetWorldList
  
***************
*** 4594,4600 ****
  static int L_SpellCheck (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->SpellCheck (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_SpellCheck
  
--- 4595,4601 ----
  static int L_SpellCheck (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->SpellCheck (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_SpellCheck
  
***************
*** 4617,4623 ****
  static int L_SpellCheckDlg (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   COleVariant v = pDoc->SpellCheckDlg (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_SpellCheckDlg
  
--- 4618,4624 ----
  static int L_SpellCheckDlg (lua_State *L)
    {
    CMUSHclientDoc *pDoc = doc (L);
!   VARIANT v = pDoc->SpellCheckDlg (my_checkstring (L, 1));
    return pushVariant (L, v);
    } // end of L_SpellCheckDlg
  
***************
*** 4745,4751 ****
  static int L_UdpPortList (lua_State *L)
    {
    CMUSHclientDoc * pDoc = doc (L);  // must do this first
!   COleVariant v = pDoc->UdpPortList ();
    return pushVariant (L, v);
    } // end of L_UdpPortList
  
--- 4746,4752 ----
  static int L_UdpPortList (lua_State *L)
    {
    CMUSHclientDoc * pDoc = doc (L);  // must do this first
!   VARIANT v = pDoc->UdpPortList ();
    return pushVariant (L, v);
    } // end of L_UdpPortList
  
Index: methods.cpp
===================================================================
RCS file: /cvs/mushclient/methods.cpp,v
retrieving revision 1.205
diff -c -r1.205 methods.cpp
*** methods.cpp	29 Apr 2008 00:19:18 -0000	1.205
--- methods.cpp	27 May 2008 01:48:34 -0000
***************
*** 841,847 ****
  CVariable * variable_item;
  VARIANT vaResult;
  
! 	VariantInit(&vaResult);
  
    vaResult.vt = VT_NULL;
  
--- 841,847 ----
  CVariable * variable_item;
  VARIANT vaResult;
  
!   VariantInit(&vaResult);
  
    vaResult.vt = VT_NULL;
  
Index: mushclient.hlp
===================================================================
RCS file: /cvs/mushclient/mushclient.hlp,v
retrieving revision 1.90
diff -c -r1.90 mushclient.hlp
Binary files /tmp/cvsZj1kWV and mushclient.hlp differ
Index: install/Make Installer.lnk
===================================================================
RCS file: /cvs/mushclient/install/Make Installer.lnk,v
retrieving revision 1.4
diff -c -r1.4 Make Installer.lnk
Binary files /tmp/cvspiEtvC and Make Installer.lnk differ
Index: install/mushclient.nsi
===================================================================
RCS file: /cvs/mushclient/install/mushclient.nsi,v
retrieving revision 1.55
diff -c -r1.55 mushclient.nsi
*** install/mushclient.nsi	11 May 2008 04:30:00 -0000	1.55
--- install/mushclient.nsi	27 May 2008 01:48:36 -0000
***************
*** 148,153 ****
--- 148,154 ----
     
    File "..\Localize_template.lua"
    File "..\..\mushclient_resources\Release\en.dll"
+   File "..\WinRel\locale\en_small.dll"
    File "..\count_locale_usage.lua"
    File "..\detect_locale_changes.lua"
    File "..\locale_notes.txt"
***************
*** 316,321 ****
--- 317,324 ----
    File "..\plugins\Timer.xml"
    File "..\plugins\ShowActivity.xml"
    File "..\plugins\Installer_sumcheck.xml"
+   File "..\plugins\Copy_Output.xml"
+   File "..\plugins\lua_chat.xml"
  
  SectionEnd
  
***************
*** 350,355 ****
--- 353,359 ----
    Delete "$INSTDIR\MUSHclient.ico"
    Delete "$INSTDIR\MUSHclient.hlp"
    Delete "$INSTDIR\MUSHclient.cnt"
+   Delete "$INSTDIR\license.txt"
  
    ; readme and tips
    Delete "$INSTDIR\readme.txt"
***************
*** 369,374 ****
--- 373,380 ----
    Delete "$INSTDIR\scripts\exampscript.pys"
    Delete "$INSTDIR\scripts\exampscript.lua"
  
+   RMDir  "$INSTDIR\scripts"
+   
    ; lua stuff
    Delete "$INSTDIR\lua\addxml.lua"
    Delete "$INSTDIR\lua\check.lua"
***************
*** 415,456 ****
    RMDir  "$INSTDIR\fonts"
  
    ; plugins
!   Delete "$INSTDIR\plugins\constants.vbs"
!   Delete "$INSTDIR\plugins\constants.js"
!   Delete "$INSTDIR\plugins\constants.pl"
!   Delete "$INSTDIR\plugins\constants.pys"
!   Delete "$INSTDIR\plugins\constants.lua"
!   Delete "$INSTDIR\plugins\plugin_list.xml"
!   Delete "$INSTDIR\plugins\random_socials.xml"
!   Delete "$INSTDIR\plugins\sample_plugin.xml"
!   Delete "$INSTDIR\plugins\scan.xml"
!   Delete "$INSTDIR\plugins\msp.xml"
!   Delete "$INSTDIR\plugins\reverse_speedwalk.xml"
!   Delete "$INSTDIR\plugins\SMAUG_automapper_helper.xml"
!   Delete "$INSTDIR\plugins\multiple_send.xml"
!   Delete "$INSTDIR\plugins\idle_message.xml"
!   Delete "$INSTDIR\plugins\MUSH_teleport.xml"
!   Delete "$INSTDIR\plugins\ColourNote.xml"
!   Delete "$INSTDIR\plugins\NewActivity.xml"
!   Delete "$INSTDIR\plugins\MudDatabase.xml"
!   Delete "$INSTDIR\plugins\Chat.xml"
!   Delete "$INSTDIR\plugins\Health_Bar.xml"
!   Delete "$INSTDIR\plugins\JScript_Version.xml"
!   Delete "$INSTDIR\plugins\Perlscript_Version.xml"
!   Delete "$INSTDIR\plugins\Python_Version.xml"
!   Delete "$INSTDIR\plugins\VBscript_Version.xml"
!   Delete "$INSTDIR\plugins\ANSI_Log.xml"
!   Delete "$INSTDIR\plugins\Hyperlink_URL.xml"
!   Delete "$INSTDIR\plugins\Gag.xml"
!   Delete "$INSTDIR\plugins\Status_Bar_Prompt.xml"
!   Delete "$INSTDIR\plugins\Timer.xml"
!   Delete "$INSTDIR\plugins\ShowActivity.xml"
!   Delete "$INSTDIR\plugins\Installer_sumcheck.xml"
! 
    ; locale stuff
    
    Delete "$INSTDIR\locale\Localize_template.lua"
    Delete "$INSTDIR\locale\en.dll"
    Delete "$INSTDIR\locale\count_locale_usage.lua"
    Delete "$INSTDIR\locale\detect_locale_changes.lua"
    Delete "$INSTDIR\locale\locale_notes.txt"
--- 421,465 ----
    RMDir  "$INSTDIR\fonts"
  
    ; plugins
!   Delete "$INSTDIR\worlds\plugins\constants.vbs"
!   Delete "$INSTDIR\worlds\plugins\constants.js"
!   Delete "$INSTDIR\worlds\plugins\constants.pl"
!   Delete "$INSTDIR\worlds\plugins\constants.pys"
!   Delete "$INSTDIR\worlds\plugins\constants.lua"
!   Delete "$INSTDIR\worlds\plugins\plugin_list.xml"
!   Delete "$INSTDIR\worlds\plugins\random_socials.xml"
!   Delete "$INSTDIR\worlds\plugins\sample_plugin.xml"
!   Delete "$INSTDIR\worlds\plugins\scan.xml"
!   Delete "$INSTDIR\worlds\plugins\msp.xml"
!   Delete "$INSTDIR\worlds\plugins\reverse_speedwalk.xml"
!   Delete "$INSTDIR\worlds\plugins\SMAUG_automapper_helper.xml"
!   Delete "$INSTDIR\worlds\plugins\multiple_send.xml"
!   Delete "$INSTDIR\worlds\plugins\idle_message.xml"
!   Delete "$INSTDIR\worlds\plugins\MUSH_teleport.xml"
!   Delete "$INSTDIR\worlds\plugins\ColourNote.xml"
!   Delete "$INSTDIR\worlds\plugins\NewActivity.xml"
!   Delete "$INSTDIR\worlds\plugins\MudDatabase.xml"
!   Delete "$INSTDIR\worlds\plugins\Chat.xml"
!   Delete "$INSTDIR\worlds\plugins\Health_Bar.xml"
!   Delete "$INSTDIR\worlds\plugins\JScript_Version.xml"
!   Delete "$INSTDIR\worlds\plugins\Perlscript_Version.xml"
!   Delete "$INSTDIR\worlds\plugins\Python_Version.xml"
!   Delete "$INSTDIR\worlds\plugins\VBscript_Version.xml"
!   Delete "$INSTDIR\worlds\plugins\ANSI_Log.xml"
!   Delete "$INSTDIR\worlds\plugins\Hyperlink_URL.xml"
!   Delete "$INSTDIR\worlds\plugins\Gag.xml"
!   Delete "$INSTDIR\worlds\plugins\Status_Bar_Prompt.xml"
!   Delete "$INSTDIR\worlds\plugins\Timer.xml"
!   Delete "$INSTDIR\worlds\plugins\ShowActivity.xml"
!   Delete "$INSTDIR\worlds\plugins\Installer_sumcheck.xml"
!   Delete "$INSTDIR\worlds\plugins\Copy_Output.xml"
!   Delete "$INSTDIR\worlds\plugins\lua_chat.xml"
!   
    ; locale stuff
    
    Delete "$INSTDIR\locale\Localize_template.lua"
    Delete "$INSTDIR\locale\en.dll"
+   Delete "$INSTDIR\locale\en_small.dll"
    Delete "$INSTDIR\locale\count_locale_usage.lua"
    Delete "$INSTDIR\locale\detect_locale_changes.lua"
    Delete "$INSTDIR\locale\locale_notes.txt"
Index: install/readme.txt
===================================================================
RCS file: /cvs/mushclient/install/readme.txt,v
retrieving revision 1.163
diff -c -r1.163 readme.txt
*** install/readme.txt	29 Apr 2008 00:19:18 -0000	1.163
--- install/readme.txt	27 May 2008 01:48:36 -0000
***************
*** 1,7 ****
! MUSHclient version 4.24
  =======================
  
! Tuesday, 29th April 2008
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/
--- 1,7 ----
! MUSHclient version 4.25
  =======================
  
! Tuesday, 27th May 2008
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/