Added elapsed time for GetLineInfo

Author: nickgammon

scripting/lua_methods.cpp

@@ -2827,9 +2827,27 @@ static int L_GetLineInfo (lua_State *L)
     MakeTableItem     (L, "styles",   pLine->styleList.GetCount ()); // 11
 
     // high-performance timer
-    double ticks = (double) pLine->m_lineHighPerformanceTime.QuadPart / (double) App.m_iCounterFrequency;
+    double ticks = 0;
+    
+    if (App.m_iCounterFrequency)
+      ticks = (double) pLine->m_lineHighPerformanceTime.QuadPart / (double) App.m_iCounterFrequency;
     MakeTableItem (L, "ticks", ticks);
 
+    LONGLONG iTimeTaken;
+    double fElapsedTime;
+
+    // elapsed time from when world started
+    iTimeTaken = pLine->m_lineHighPerformanceTime.QuadPart - 
+                 pDoc->m_whenWorldStartedHighPrecision.QuadPart;
+    
+    if (App.m_iCounterFrequency)
+     fElapsedTime = ((double) iTimeTaken) / 
+                    ((double) App.m_iCounterFrequency);
+    else
+     fElapsedTime = pLine->m_theTime.GetTime () - (double) pDoc->m_whenWorldStarted.GetTime ();
+
+    MakeTableItem (L, "elapsed", fElapsedTime);
+
     return 1;   // one table
     }     // end of returning a table
 

scripting/methods/methods_info.cpp

@@ -1198,6 +1198,24 @@ CLine * pLine = m_LineList.GetAt (GetLinePosition (LineNumber - 1));
       }
       break;
 
+    case 13:
+      {
+      LONGLONG iTimeTaken;
+      double fElapsedTime;
+
+      // elapsed time from when world started
+      iTimeTaken = pLine->m_lineHighPerformanceTime.QuadPart - 
+                   m_whenWorldStartedHighPrecision.QuadPart;
+    
+      if (App.m_iCounterFrequency)
+       fElapsedTime = ((double) iTimeTaken) / 
+                      ((double) App.m_iCounterFrequency);
+      else
+       fElapsedTime = pLine->m_theTime.GetTime () - (double) m_whenWorldStarted.GetTime ();
+      SetUpVariantDouble (vaResult, fElapsedTime);
+      }
+      break;
+
     default:
       vaResult.vt = VT_NULL;
       break;