Gammon Forum

-- get file name
local filename = utils.filepicker ("Choose file to convert")

if not filename then
  return
end -- no file

-- read original file
local f = io.open (filename, "rb")  -- binary mode
local s = f:read ("*a")  -- read entire file
f:close ()

local count

-- convert file
s, count = string.gsub (s, "\r", "")

-- write converted file
f = io.open (filename, "wb")
f:write (s)  -- write entire file
f:close ()

-- show summary
print ("File " .. filename .. " written, " 
       .. count .. " carriage-returns removed, " 
       .. " new file size is " .. #s .. " bytes.")

===================================================================

RCS file: /cvs/mushclient/mushclient.cnt,v

retrieving revision 1.25

diff -c -r1.25 mushclient.cnt

*** mushclient.cnt	16 Jun 2007 01:27:37 -0000	1.25

--- mushclient.cnt	22 Jul 2007 02:41:25 -0000

***************

*** 431,436 ****

--- 431,437 ----

  3 SendPkt=FNC_SendPkt  3 SendNoEcho=FNC_SendNoEcho   3 SendPush=FNC_SendPush + 3 SendSpecial=FNC_SendSpecial   3 SendToNotepad=FNC_SendToNotepad   3 SetAliasOption=FNC_SetAliasOption   3 SetAlphaOption=FNC_SetAlphaOption Index: mushclient.hlp

===================================================================

===================================================================
RCS file: /cvs/mushclient/mushclient.cnt,v
retrieving revision 1.25
diff -c -r1.25 mushclient.cnt
*** mushclient.cnt	16 Jun 2007 01:27:37 -0000	1.25
--- mushclient.cnt	22 Jul 2007 02:41:25 -0000
***************
*** 431,436 ****
--- 431,437 ----
 3 SendPkt=FNC_SendPkt
 3 SendNoEcho=FNC_SendNoEcho
 3 SendPush=FNC_SendPush
+3 SendSpecial=FNC_SendSpecial
 3 SendToNotepad=FNC_SendToNotepad
 3 SetAliasOption=FNC_SetAliasOption
 3 SetAlphaOption=FNC_SetAlphaOption
Index: mushclient.hlp
===================================================================

Index: MUSHclient.rc
===================================================================
RCS file: /cvs/mushclient/MUSHclient.rc,v
retrieving revision 1.210
retrieving revision 1.211
diff -c -r1.210 -r1.211
*** MUSHclient.rc	24 Dec 2007 01:18:05 -0000	1.210
--- MUSHclient.rc	30 Dec 2007 04:32:12 -0000	1.211
***************
*** 56,63 ****
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,19,0
!  PRODUCTVERSION 4,0,19,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
--- 56,63 ----
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,20,0
!  PRODUCTVERSION 4,0,20,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.19\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2007 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.19\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.20\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2007 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.20\0"
              VALUE "SpecialBuild", "\0"
          END
      END
Index: doc.h
===================================================================
RCS file: /cvs/mushclient/doc.h,v
retrieving revision 1.229
retrieving revision 1.230
diff -c -r1.229 -r1.230
*** doc.h	24 Dec 2007 01:18:05 -0000	1.229
--- doc.h	30 Dec 2007 04:32:12 -0000	1.230
***************
*** 21,28 ****
  
  // New versions - things to change
  
! #define THISVERSION 419                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.19";    // 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 420                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.20";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
Index: mushclient.hlp
===================================================================
RCS file: /cvs/mushclient/mushclient.hlp,v
retrieving revision 1.87
retrieving revision 1.88
diff -c -r1.87 -r1.88
Binary files /tmp/cvszcmHjk and /tmp/cvs5hgvmw differ
Index: xml_save_world.cpp
===================================================================
RCS file: /cvs/mushclient/xml_save_world.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** xml_save_world.cpp	4 Aug 2007 09:36:29 -0000	1.53
--- xml_save_world.cpp	30 Dec 2007 04:32:23 -0000	1.54
***************
*** 177,190 ****
                         const double & fNumber,
                         const bool sameline)
    {
!   if (fNumber)
!     {
!     // if number has decimal places, need special treatment
!     if (floor (fNumber) != fNumber)
!       {
!       // see: http://www.gammon.com.au/forum/?id=8077
        char old_locale[256];
!       strncpy(old_locale, setlocale(LC_NUMERIC, NULL), sizeof old_locale); /* store the locale */
        old_locale [255] = 0;
        // want numbers formatted correctly
        setlocale (LC_NUMERIC, "C" );
--- 177,189 ----
                         const double & fNumber,
                         const bool sameline)
    {
! 
!   /*
!   --- THIS DIDN'T WORK, see: http://www.gammon.com.au/forum/?id=7953&page=2
! 
!         // see: http://www.gammon.com.au/forum/?id=8077
        char old_locale[256];
!       strncpy(old_locale, setlocale(LC_NUMERIC, NULL), sizeof old_locale); // store the locale
        old_locale [255] = 0;
        // want numbers formatted correctly
        setlocale (LC_NUMERIC, "C" );
***************
*** 192,206 ****
                         sName, 
                         FixHTMLString (CFormat ("%.2f", fNumber)), 
                         sameline);
!       setlocale(LC_NUMERIC, old_locale);         /* restore the old locale */
!       }
!     else
!       Save_XML_string (ar, 
!                        sName, 
!                        FixHTMLString (CFormat ("%.2f", fNumber)), 
!                        sameline);
  
-     }
    } // end of Save_XML_double
  
  void Save_XML_colour  (CArchive& ar, 
--- 191,208 ----
                         sName, 
                         FixHTMLString (CFormat ("%.2f", fNumber)), 
                         sameline);
!       setlocale(LC_NUMERIC, old_locale);         // restore the old locale
! 
!       */
! 
!   CString strNumber = CFormat ("%.2f", fNumber);
!   strNumber.Replace (",", ".");    // don't want any blasted commas!
! 
!   Save_XML_string (ar, 
!                    sName, 
!                    FixHTMLString (strNumber), 
!                    sameline);
  
    } // end of Save_XML_double
  
  void Save_XML_colour  (CArchive& ar, 
Index: install/readme.txt
===================================================================
RCS file: /cvs/mushclient/install/readme.txt,v
retrieving revision 1.158
retrieving revision 1.159
diff -c -r1.158 -r1.159
*** install/readme.txt	24 Dec 2007 01:18:05 -0000	1.158
--- install/readme.txt	30 Dec 2007 04:32:23 -0000	1.159
***************
*** 1,7 ****
! MUSHclient version 4.19
  =======================
  
! Monday, 24th December 2007
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/
--- 1,7 ----
! MUSHclient version 4.20
  =======================
  
! Sunday, 30th December 2007
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/