Index: CreditsDlg.cpp =================================================================== RCS file: /cvs/mushclient/CreditsDlg.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -c -r1.7 -r1.8 *** CreditsDlg.cpp 13 Jun 2007 17:57:28 -0000 1.7 --- CreditsDlg.cpp 22 Jul 2007 02:46:05 -0000 1.8 *************** *** 58,71 **** hRsrc = FindResource (App.m_hInstDLL, MAKEINTRESOURCE (m_iResourceID), "TEXT"); if (hRsrc) hRsrc_text = LoadResource (App.m_hInstDLL, hRsrc); if (hRsrc_text) p = (char *) LockResource (hRsrc_text); if (p) ! m_ctlCreditsText.SetWindowText (p); else m_ctlCreditsText.SetWindowText (Translate ("Could not load text")); --- 58,77 ---- hRsrc = FindResource (App.m_hInstDLL, MAKEINTRESOURCE (m_iResourceID), "TEXT"); + DWORD iLength = 0; + if (hRsrc) + { hRsrc_text = LoadResource (App.m_hInstDLL, hRsrc); + iLength = SizeofResource (App.m_hInstDLL, hRsrc); + } if (hRsrc_text) p = (char *) LockResource (hRsrc_text); + if (p) ! m_ctlCreditsText.SetWindowText (CString (p, iLength)); else m_ctlCreditsText.SetWindowText (Translate ("Could not load text")); Index: MUSHclient.rc =================================================================== RCS file: /cvs/mushclient/MUSHclient.rc,v retrieving revision 1.204 retrieving revision 1.205 diff -c -r1.204 -r1.205 *** MUSHclient.rc 19 Jun 2007 23:19:12 -0000 1.204 --- MUSHclient.rc 22 Jul 2007 02:46:05 -0000 1.205 *************** *** 56,63 **** // VS_VERSION_INFO VERSIONINFO ! FILEVERSION 4,0,13,0 ! PRODUCTVERSION 4,0,13,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L --- 56,63 ---- // VS_VERSION_INFO VERSIONINFO ! FILEVERSION 4,0,14,0 ! PRODUCTVERSION 4,0,14,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.13\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.13\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.14\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.14\0" VALUE "SpecialBuild", "\0" END END Index: doc.cpp =================================================================== RCS file: /cvs/mushclient/doc.cpp,v retrieving revision 1.218 retrieving revision 1.219 diff -c -r1.218 -r1.219 *** doc.cpp 21 Jun 2007 05:31:54 -0000 1.218 --- doc.cpp 22 Jul 2007 02:46:05 -0000 1.219 *************** *** 496,501 **** --- 496,502 ---- DISP_FUNCTION(CMUSHclientDoc, "SetCustomColourName", SetCustomColourName, VT_I4, VTS_I2 VTS_BSTR) DISP_FUNCTION(CMUSHclientDoc, "GetNotepadList", GetNotepadList, VT_VARIANT, VTS_BOOL) DISP_FUNCTION(CMUSHclientDoc, "TranslateDebug", TranslateDebug, VT_I4, VTS_BSTR) + DISP_FUNCTION(CMUSHclientDoc, "SendSpecial", SendSpecial, VT_I4, VTS_BSTR VTS_BOOL VTS_BOOL VTS_BOOL VTS_BOOL) DISP_PROPERTY_PARAM(CMUSHclientDoc, "NormalColour", GetNormalColour, SetNormalColour, VT_I4, VTS_I2) DISP_PROPERTY_PARAM(CMUSHclientDoc, "BoldColour", GetBoldColour, SetBoldColour, VT_I4, VTS_I2) DISP_PROPERTY_PARAM(CMUSHclientDoc, "CustomColourText", GetCustomColourText, SetCustomColourText, VT_I4, VTS_I2) *************** *** 7747,7751 **** putontoclipboard (QuoteForumCodes (strContents)); } - --- 7748,7751 ---- Index: doc.h =================================================================== RCS file: /cvs/mushclient/doc.h,v retrieving revision 1.222 retrieving revision 1.223 diff -c -r1.222 -r1.223 *** doc.h 19 Jun 2007 23:19:12 -0000 1.222 --- doc.h 22 Jul 2007 02:46:06 -0000 1.223 *************** *** 21,28 **** // New versions - things to change ! #define THISVERSION 413 // Step 1. ! const CString MUSHCLIENT_VERSION = "4.13"; // 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 414 // Step 1. ! const CString MUSHCLIENT_VERSION = "4.14"; // Step 2. // Step 3. Don't forget VERSION resource in Resources tab // Step 4. Remember: README.TXT *************** *** 1261,1266 **** --- 1261,1268 ---- const CString & strArguments, CArgumentList & ArgumentList); + void AddToCommandHistory (LPCTSTR Message); + // simple test to see if we are in secure mode right now inline bool MXP_Secure (void) { *************** *** 2388,2393 **** --- 2390,2396 ---- afx_msg long SetCustomColourName(short WhichColour, LPCTSTR Name); afx_msg VARIANT GetNotepadList(BOOL All); afx_msg long TranslateDebug(LPCTSTR Message); + afx_msg long SendSpecial(LPCTSTR Message, BOOL Echo, BOOL Queue, BOOL Log, BOOL History); afx_msg long GetNormalColour(short WhichColour); afx_msg void SetNormalColour(short WhichColour, long nNewValue); afx_msg long GetBoldColour(short WhichColour); Index: functionlist.cpp =================================================================== RCS file: /cvs/mushclient/functionlist.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -c -r1.24 -r1.25 *** functionlist.cpp 16 Jun 2007 01:27:37 -0000 1.24 --- functionlist.cpp 22 Jul 2007 02:46:06 -0000 1.25 *************** *** 285,291 **** "SendImmediate", "SendNoEcho", "SendPkt", ! "SendPush", "SendToNotepad", "SetAliasOption", "SetAlphaOption", --- 285,292 ---- "SendImmediate", "SendNoEcho", "SendPkt", ! "SendPush", ! "SendSpecial", "SendToNotepad", "SetAliasOption", "SetAlphaOption", Index: globalregistryoptions.cpp =================================================================== RCS file: /cvs/mushclient/globalregistryoptions.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -c -r1.14 -r1.15 *** globalregistryoptions.cpp 21 Jul 2007 03:43:37 -0000 1.14 --- globalregistryoptions.cpp 22 Jul 2007 02:46:06 -0000 1.15 *************** *** 139,158 **** HRSRC hRsrc; HGLOBAL hRsrc_text = NULL; char * p = NULL; ! // Load the text of the Lua sandbox hRsrc = FindResource (App.m_hInstDLL, MAKEINTRESOURCE (IDR_LUA_SCRIPT), "TEXT"); if (hRsrc) hRsrc_text = LoadResource (App.m_hInstDLL, hRsrc); if (hRsrc_text) p = (char *) LockResource (hRsrc_text); if (p) ! m_strLuaScript = p; else m_strLuaScript = "-- Lua initialization could not be loaded"; } --- 139,161 ---- HRSRC hRsrc; HGLOBAL hRsrc_text = NULL; char * p = NULL; ! DWORD iLength = 0; // Load the text of the Lua sandbox hRsrc = FindResource (App.m_hInstDLL, MAKEINTRESOURCE (IDR_LUA_SCRIPT), "TEXT"); if (hRsrc) + { hRsrc_text = LoadResource (App.m_hInstDLL, hRsrc); + iLength = SizeofResource (App.m_hInstDLL, hRsrc); + } if (hRsrc_text) p = (char *) LockResource (hRsrc_text); if (p) ! m_strLuaScript = CString (p, iLength); else m_strLuaScript = "-- Lua initialization could not be loaded"; } Index: lua_methods.cpp =================================================================== RCS file: /cvs/mushclient/lua_methods.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -c -r1.74 -r1.75 *** lua_methods.cpp 16 Jun 2007 01:27:37 -0000 1.74 --- lua_methods.cpp 22 Jul 2007 02:46:06 -0000 1.75 *************** *** 4215,4220 **** --- 4215,4234 ---- return 1; // number of result fields } // end of L_SendPush + //---------------------------------------- + // world.SendSpecial + //---------------------------------------- + static int L_SendSpecial (lua_State *L) + { + CMUSHclientDoc * pDoc = doc (L); // must do this first + lua_pushnumber (L, pDoc->SendSpecial (my_checkstring (L, 1), + optboolean (L, 2, 0), // Echo + optboolean (L, 3, 0), // Queue + optboolean (L, 4, 0), // Log + optboolean (L, 5, 0)) // History + ); + return 1; // number of result fields + } // end of L_SendSpecial //---------------------------------------- // world.SendToNotepad *************** *** 5021,5026 **** --- 5035,5041 ---- {"SendNoEcho", L_SendNoEcho}, {"SendPkt", L_SendPkt}, {"SendPush", L_SendPush}, + {"SendSpecial", L_SendSpecial}, {"SendToNotepad", L_SendToNotepad}, {"SetAliasOption", L_SetAliasOption}, {"SetAlphaOption", L_SetAlphaOption}, Index: methods.cpp =================================================================== RCS file: /cvs/mushclient/methods.cpp,v retrieving revision 1.199 retrieving revision 1.200 diff -c -r1.199 -r1.200 *** methods.cpp 18 Jun 2007 00:07:18 -0000 1.199 --- methods.cpp 22 Jul 2007 02:46:06 -0000 1.200 *************** *** 100,115 **** return eOK; } - long CMUSHclientDoc::SendPush(LPCTSTR Message) - { - if (m_iConnectPhase != eConnectConnectedToMud) - return eWorldClosed; - - // cannot change what we are sending in OnPluginSent - if (m_bPluginProcessingSent) - return eItemInUse; ! SendMsg (Message, m_display_my_input, false, false); // don't queue it for(POSITION pos = GetFirstViewPosition(); pos != NULL; ) { --- 100,108 ---- return eOK; } ! void CMUSHclientDoc::AddToCommandHistory (LPCTSTR Message) ! { for(POSITION pos = GetFirstViewPosition(); pos != NULL; ) { *************** *** 138,146 **** --- 131,173 ---- } // end of being a CSendView } // end of loop through views + } // end of CMUSHclientDoc::AddToCommandHistory + + long CMUSHclientDoc::SendPush(LPCTSTR Message) + { + if (m_iConnectPhase != eConnectConnectedToMud) + return eWorldClosed; + + // cannot change what we are sending in OnPluginSent + if (m_bPluginProcessingSent) + return eItemInUse; + + SendMsg (Message, m_display_my_input, false, false); // don't queue it + + AddToCommandHistory (Message); + return eOK; } // end of SendPush + long CMUSHclientDoc::SendSpecial(LPCTSTR Message, BOOL Echo, BOOL Queue, BOOL Log, BOOL History) + { + if (m_iConnectPhase != eConnectConnectedToMud) + return eWorldClosed; + + // cannot change what we are sending in OnPluginSent + if (m_bPluginProcessingSent) + return eItemInUse; + + // send with appropriate options + SendMsg (Message, Echo, Queue, Log); + + if (History) + AddToCommandHistory (Message); + + return eOK; + + } + long CMUSHclientDoc::LogSend(LPCTSTR Message) { *************** *** 6562,6568 **** CTextDocument * pTextDoc = FindNotepad (Title); if (pTextDoc) ! return pTextDoc->DoSave(FileName, ReplaceExisting) == 0; return false; } --- 6589,6595 ---- CTextDocument * pTextDoc = FindNotepad (Title); if (pTextDoc) ! return pTextDoc->DoSave(FileName, ReplaceExisting); return false; } Index: mushclient.cnt =================================================================== RCS file: /cvs/mushclient/mushclient.cnt,v retrieving revision 1.25 retrieving revision 1.26 diff -c -r1.25 -r1.26 *** mushclient.cnt 16 Jun 2007 01:27:37 -0000 1.25 --- mushclient.cnt 22 Jul 2007 02:46:06 -0000 1.26 *************** *** 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.hlp,v retrieving revision 1.82 retrieving revision 1.83 diff -c -r1.82 -r1.83 Binary files /tmp/cvsqrENY2 and /tmp/cvsTfkFOM differ Index: mushclient.odl =================================================================== RCS file: /cvs/mushclient/mushclient.odl,v retrieving revision 1.104 retrieving revision 1.105 diff -c -r1.104 -r1.105 *** mushclient.odl 16 Jun 2007 01:27:38 -0000 1.104 --- mushclient.odl 22 Jul 2007 02:46:14 -0000 1.105 *************** *** 70,83 **** [id(44)] long SetCommand(BSTR Message); [id(45)] BSTR GetNotes(); [id(46)] void SetNotes(BSTR Message); ! [id(312), propget] long NormalColour(short WhichColour); ! [id(312), propput] void NormalColour(short WhichColour, long nNewValue); ! [id(313), propget] long BoldColour(short WhichColour); ! [id(313), propput] void BoldColour(short WhichColour, long nNewValue); ! [id(314), propget] long CustomColourText(short WhichColour); ! [id(314), propput] void CustomColourText(short WhichColour, long nNewValue); ! [id(315), propget] long CustomColourBackground(short WhichColour); ! [id(315), propput] void CustomColourBackground(short WhichColour, long nNewValue); [id(47)] void Redraw(); [id(48)] long ResetTimer(BSTR TimerName); [id(49)] void SetOutputFont(BSTR FontName, short PointSize); --- 70,83 ---- [id(44)] long SetCommand(BSTR Message); [id(45)] BSTR GetNotes(); [id(46)] void SetNotes(BSTR Message); ! [id(313), propget] long NormalColour(short WhichColour); ! [id(313), propput] void NormalColour(short WhichColour, long nNewValue); ! [id(314), propget] long BoldColour(short WhichColour); ! [id(314), propput] void BoldColour(short WhichColour, long nNewValue); ! [id(315), propget] long CustomColourText(short WhichColour); ! [id(315), propput] void CustomColourText(short WhichColour, long nNewValue); ! [id(316), propget] long CustomColourBackground(short WhichColour); ! [id(316), propput] void CustomColourBackground(short WhichColour, long nNewValue); [id(47)] void Redraw(); [id(48)] long ResetTimer(BSTR TimerName); [id(49)] void SetOutputFont(BSTR FontName, short PointSize); *************** *** 343,348 **** --- 343,349 ---- [id(309)] long SetCustomColourName(short WhichColour, BSTR Name); [id(310)] VARIANT GetNotepadList(BOOL All); [id(311)] long TranslateDebug(BSTR Message); + [id(312)] long SendSpecial(BSTR Message, BOOL Echo, BOOL Queue, BOOL Log, BOOL History); //}}AFX_ODL_METHOD }; Index: install/readme.txt =================================================================== RCS file: /cvs/mushclient/install/readme.txt,v retrieving revision 1.151 retrieving revision 1.152 diff -c -r1.151 -r1.152 *** install/readme.txt 21 Jul 2007 03:43:45 -0000 1.151 --- install/readme.txt 22 Jul 2007 02:46:14 -0000 1.152 *************** *** 1,7 **** ! MUSHclient version 4.13 ======================= ! Saturday, 21st July 2007 Author: Nick Gammon Web support: http://www.gammon.com.au/forum/ --- 1,7 ---- ! MUSHclient version 4.14 ======================= ! Sunday, 22nd July 2007 Author: Nick Gammon Web support: http://www.gammon.com.au/forum/