Fixed bug, removed *.clw files from git

Author: nickgammon

.gitignore

@@ -43,6 +43,7 @@ find_non_standard_encoding.lua
 *.po
 *.GID
 *.suo
+*.clw
 
 #
 #  Notes for me:

OtherTypes.h

@@ -905,7 +905,7 @@ typedef CTypedPtrList <CPtrList, CActiveTag*> CActiveTagList;
 /////////////////////////////////////////////////////////////////////////////
 //  CPlugin - these are world plugins
 
-// for storing map directions, and inverses of them
+// for storing dispatch IDs, and how many times each one is called
 class CScriptDispatchID
   {
   public:
@@ -931,12 +931,12 @@ class CScriptDispatchID
     // returns true if DISPID is valid
     inline bool isvalid () const { return _dispid != DISPID_UNKNOWN; };
 
-    DISPID _dispid;
-    __int64 _count;
+    DISPID _dispid;   // the dispatch ID from the COM engine, or  DISPID_UNKNOWN
+    __int64 _count;   // count of attempts to call it (if not DISPID_UNKNOWN)
   };  // end of class CScriptDispatchID
 
-typedef map<const char *, CScriptDispatchID> CScriptDispatchIDsMap;
-typedef map<const char *, CScriptDispatchID>::const_iterator CScriptDispatchIDIterator;
+typedef map<const string, CScriptDispatchID> CScriptDispatchIDsMap;
+typedef map<const string, CScriptDispatchID>::const_iterator CScriptDispatchIDIterator;
 
 
 class CScriptEngine;

ddx.clw

@@ -1313,7 +1313,7 @@ VARIANT CMUSHclientDoc::Debug(LPCTSTR Command)
         {
         CTimer * pTimer;
         CString strName;
-        GetTimerMap ().GetNextAssoc (timerpos, strName, pTimer);
+        pPlugin->m_TimerMap.GetNextAssoc (timerpos, strName, pTimer);
         } // end of for loop
 
 
@@ -2055,29 +2055,18 @@ void CMUSHclientDoc::DebugHelper (const CString strAction, CString strArgument)
 
     ColourNote  (SCRIPTERRORCONTEXTFORECOLOUR, "", "------ Callback List (alphabetic order) ------");
     Note ("");
-
     int iCount = 0;
-    map<string,CScriptDispatchID> sortedCallbacks;
 
     for (CScriptDispatchIDIterator it = m_CurrentPlugin->m_PluginCallbacks.begin ();
          it != m_CurrentPlugin->m_PluginCallbacks.end ();
          it++)
-
       if (it->second.isvalid () || it->second._count > 0)
-        sortedCallbacks [it->first] = it->second;
-
-    // this will get them into alphabetic order (the original map is by pointers, not sorted by name)
-
-    for (map<string,CScriptDispatchID>::const_iterator it2 = sortedCallbacks.begin ();
-         it2 != sortedCallbacks.end ();
-         it2++)
-
         {
         iCount++;
-        Note ( CFormat ("%-30s : Valid: %s.  Called %I64i time%s.", 
-                                  it2->first.c_str (),
-                                  SHOW_TRUE (it2->second.isvalid ()),
-                                  PLURAL (it2->second._count)
+        Note ( CFormat ("%-30s -> Valid: %s.  %10I64i call%s.", 
+                                  it->first.c_str (),
+                                  SHOW_TRUE (it->second.isvalid ()),
+                                  PLURAL (it->second._count)
                                   ));
 
         }