Replace GetTickCount with the equivalent OpenW3D macro

rm5248 · rm5248 · commit 5208bfe4eabb · 2025-11-17T21:13:44.000-05:00
diff --git a/Code/Commando/GameSpy_QnR.cpp b/Code/Commando/GameSpy_QnR.cpp
@@ -754,7 +754,7 @@ int main(int argc, char* argv[])
 {
 	CGameSpyQnR mygame1("Test Game Server 1"), mygame2("Test Game Server 2");
 
-	srand( GetTickCount() );
+	srand( TIMEGETTIME() );
 	
 	printf("Press any key to quit\n");
 	while (!_kbhit())
diff --git a/Code/Commando/floodprotectionmgr.cpp b/Code/Commando/floodprotectionmgr.cpp
@@ -70,7 +70,7 @@ FloodProtectionMgrClass::Decay_Old_Entries (void)
 {
 	const int DECAY_TIME	= 15000;
 
-	uint32 curr_time = ::GetTickCount ();
+	uint32 curr_time = ::TIMEGETTIME ();
 
 	//
 	//	Loop over all the entries in the list
@@ -124,7 +124,7 @@ FloodProtectionMgrClass::Detect_Flooding (const wchar_t *text)
 		//	Add a new entry to the list
 		//
 		FLOOD_ENTRY entry;
-		entry.time		= ::GetTickCount ();
+		entry.time		= ::TIMEGETTIME ();
 		entry.text_len	= 0;
 		FloodList.Add (entry);
 	}
diff --git a/Code/Launcher/patch.cpp b/Code/Launcher/patch.cpp
@@ -246,15 +246,15 @@ void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex, bool show_dial
 	HANDLE patchThread = CreateThread(NULL, 0, ApplyPatchThread, (LPVOID)patchfile, 0, &patchID);
 
 	int dotcnt = 9;
-	DWORD last_time = GetTickCount();
+	DWORD last_time = TIMEGETTIME();
 	BOOL forward = false;
 	char worktext[256];
     LoadStringA(NULL,IDS_WORKING_TEXT,worktext,sizeof(worktext)-12);
 	int scnt = strlen(worktext)+1;
 	strcat(worktext, " ..........");
 	// Wait for the thread to finish
 	while (rtpErrCode == -1) {
-		if (GetTickCount() - last_time > 100) {
+		if (TIMEGETTIME() - last_time > 100) {
 			if (forward) {
 				worktext[scnt+dotcnt] = '.';
 				if (dotcnt == 9) forward = false;
@@ -265,7 +265,7 @@ void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex, bool show_dial
 				else dotcnt--;
 			}
 			SetWindowText(GetDlgItem(PatchDialog,IDC_WORKING_BOX),(char *)worktext);
-			last_time = GetTickCount();
+			last_time = TIMEGETTIME();
 		}
 		while(PeekMessage(&msg,NULL,0,0, PM_REMOVE))
 		{
diff --git a/Code/Tests/PhysTest/GraphicView.cpp b/Code/Tests/PhysTest/GraphicView.cpp
@@ -396,7 +396,7 @@ void CGraphicView::Timestep(void)
 
 	// Compute the amount of time elapsed for this frame.
 	CPhysTestDoc * doc = (CPhysTestDoc *)GetDocument();
-	DWORD curtime = ::GetTickCount();
+	DWORD curtime = ::TIMEGETTIME();
 	DWORD elapsedtime = curtime - doc->LastTime;
 	if (elapsedtime > 100) {
 		elapsedtime = 100;
@@ -510,7 +510,7 @@ void CGraphicView::Set_Active(bool onoff)
 	} else { 
 		RemoveProp(m_hWnd,"Inactive"); 
 		CPhysTestDoc * doc = (CPhysTestDoc *)GetDocument();
-		doc->LastTime = ::GetTickCount();	
+		doc->LastTime = ::TIMEGETTIME();	
 	}
 }
 
diff --git a/Code/Tools/LevelEdit/CameraMgr.cpp b/Code/Tools/LevelEdit/CameraMgr.cpp
@@ -579,7 +579,7 @@ CameraMgr::On_Frame (void)
 				//
 				static DWORD last_vis_gen = 0;
 				static DWORD last_static_anim_toggle = 0;
-				DWORD current_ticks = ::GetTickCount ();
+				DWORD current_ticks = ::TIMEGETTIME ();
 				if ((::GetAsyncKeyState (VK_RETURN) < 0) && (current_ticks - last_vis_gen) > 1000) {
 					Vector3 sample_point	= m_WalkThruObj->Get_Transform ().Get_Translation () + Vector3 (0, 0, 1);
 					::Get_Scene_Editor ()->Record_Vis_Info (m_pCamera->Get_Transform (), sample_point);
@@ -1233,7 +1233,7 @@ CameraMgr::Fly_To_Transform (const Matrix3D &transform)
 	index = m_FlyToSpline.Add_Key (end_point, 1);
 	m_FlyToSpline.Set_Tangents (index, looking_end, looking_end);
 
-	m_FlyToStartTime = ::GetTickCount ();
+	m_FlyToStartTime = ::TIMEGETTIME ();
 	Set_Camera_Mode (MODE_FLYTO);
 	return ;
 }
@@ -1254,7 +1254,7 @@ CameraMgr::Update_Fly_To (void)
 		fly_ticks = fly_ticks / m_SpeedModifier;
 	}
 
-	DWORD current_time = ::GetTickCount ();
+	DWORD current_time = ::TIMEGETTIME ();
 	float spline_time = float(current_time - m_FlyToStartTime) / fly_ticks;
 	spline_time = std::min (1.0F, spline_time);
 
diff --git a/Code/Tools/LevelEdit/GenerateVisDialog.cpp b/Code/Tools/LevelEdit/GenerateVisDialog.cpp
@@ -134,7 +134,7 @@ GenerateVisDialogClass::OnOK (void)
 	// 
 	// Record the time when the vis preprocessing is started
 	//
-	DWORD start_time = ::GetTickCount();
+	DWORD start_time = ::TIMEGETTIME();
 
 	//
 	// Reset the vis data (which also causes the culling systems to re-partition)
@@ -173,7 +173,7 @@ GenerateVisDialogClass::OnOK (void)
 	//
 	// Display the total elapsed time to the user
 	//
-	DWORD elapsed_time = ::GetTickCount() - start_time;
+	DWORD elapsed_time = ::TIMEGETTIME() - start_time;
 	int hours = elapsed_time / (1000 * 60 * 60);
 	elapsed_time -= hours * (1000 * 60 * 60);
 	int minutes = elapsed_time / (1000 * 60);
diff --git a/Code/Tools/LevelEdit/GeneratingEdgeSampledVisDialog.cpp b/Code/Tools/LevelEdit/GeneratingEdgeSampledVisDialog.cpp
@@ -151,7 +151,7 @@ GeneratingEdgeSampledVisDialogClass::OnInitDialog (void)
 	//
 	//	Record the time at operation start
 	//
-	m_StartTime = ::GetTickCount ();
+	m_StartTime = ::TIMEGETTIME ();
 	Update_Stats ();
 	return true;
 }
@@ -239,7 +239,7 @@ GeneratingEdgeSampledVisDialogClass::Update_Stats (void)
 			//
 			//	Make a rough estimate of the time we have remaining
 			//
-			DWORD elapsed_ticks = ::GetTickCount () - m_StartTime;
+			DWORD elapsed_ticks = ::TIMEGETTIME () - m_StartTime;
 			DWORD avg_ticks = elapsed_ticks / std::max(processed,1);
 			DWORD remaining_ticks = avg_ticks * (total - processed);
 
diff --git a/Code/Tools/LevelEdit/GeneratingLightVisDialog.cpp b/Code/Tools/LevelEdit/GeneratingLightVisDialog.cpp
@@ -141,7 +141,7 @@ GeneratingLightVisDialogClass::WindowProc(UINT message, WPARAM wParam, LPARAM lP
 
 		::Get_Main_View ()->Allow_Repaint (false);
 		SceneEditorClass *scene_editor = ::Get_Scene_Editor ();
-		m_StartTicks = ::GetTickCount ();
+		m_StartTicks = ::TIMEGETTIME ();
 
 		/*
 		** Generate the start and end index for the lights we're going to vis
@@ -204,7 +204,7 @@ GeneratingLightVisDialogClass::Update_Status (int cur_light)
 	//
 	// Update the elapsed and estimated remaining time
 	//
-	DWORD cur_ticks = ::GetTickCount();
+	DWORD cur_ticks = ::TIMEGETTIME();
 	DWORD elapsed_ticks;
 	if (cur_ticks > m_StartTicks) {
 		elapsed_ticks = cur_ticks - m_StartTicks;
diff --git a/Code/Tools/LevelEdit/GeneratingManualVisDialog.cpp b/Code/Tools/LevelEdit/GeneratingManualVisDialog.cpp
@@ -141,7 +141,7 @@ GeneratingManualVisDialogClass::WindowProc
 		//
 		m_TotalPoints	= Get_Manual_Point_Count ();
 		m_CurrentPoint	= 0;
-		m_StartTime		= ::GetTickCount();
+		m_StartTime		= ::TIMEGETTIME();
 
 		//
 		//	Render the manual vis points
@@ -175,9 +175,9 @@ GeneratingManualVisDialogClass::On_Manual_Vis_Point_Render (DWORD milliseconds)
 	//	Process window's messages once a second
 	//
 	static DWORD last_message_pump = 0;	
-	if (::GetTickCount () - last_message_pump > 1000) {
+	if (::TIMEGETTIME () - last_message_pump > 1000) {
 		General_Pump_Messages ();
-		last_message_pump = ::GetTickCount ();
+		last_message_pump = ::TIMEGETTIME ();
 
 		//
 		//	Output our current status to the status file
@@ -250,7 +250,7 @@ GeneratingManualVisDialogClass::Update_Time (void)
 	//
 	// Compute the elapsed and estimated remaining time
 	//
-	DWORD cur_ticks = ::GetTickCount();
+	DWORD cur_ticks = ::TIMEGETTIME();
 	DWORD elapsed_ticks;
 	if (cur_ticks > m_StartTime) {
 		elapsed_ticks = cur_ticks - m_StartTime;
diff --git a/Code/Tools/LevelEdit/GeneratingVisDialog.cpp b/Code/Tools/LevelEdit/GeneratingVisDialog.cpp
@@ -230,7 +230,7 @@ GeneratingVisDialogClass::WindowProc
 	if (message == WM_USER+101) {
 
 		::Get_Main_View ()->Allow_Repaint (false);
-		m_StartTime = ::GetTickCount();
+		m_StartTime = ::TIMEGETTIME();
 
 		//
 		//	Build a list of nodes we should use during the vis-generation
@@ -309,7 +309,7 @@ GeneratingVisDialogClass::Update_Time (void)
 	//
 	// Compute the elapsed and estimated remaining time
 	//
-	DWORD cur_ticks = ::GetTickCount();
+	DWORD cur_ticks = ::TIMEGETTIME();
 	DWORD elapsed_ticks;
 	if (cur_ticks > m_StartTime) {
 		elapsed_ticks = cur_ticks - m_StartTime;
@@ -448,7 +448,7 @@ GeneratingVisDialogClass::Generate_Points
 		SetDlgItemText (IDC_STATUS_TEXT, status_text);
 
 		CString elapsed_text;
-		elapsed_text.Format ("Elapsed Time: %.1f minutes.",(::GetTickCount() - m_StartTime) / 60000.0f);
+		elapsed_text.Format ("Elapsed Time: %.1f minutes.",(::TIMEGETTIME() - m_StartTime) / 60000.0f);
 		SetDlgItemText (IDC_ELAPSED_TIME_TEXT, elapsed_text);
 		
 		m_ProgressCtrl.SetPos ((index * 100) / count);
diff --git a/Code/Tools/LevelEdit/LevelEditDoc.cpp b/Code/Tools/LevelEdit/LevelEditDoc.cpp
@@ -823,7 +823,7 @@ CLevelEditDoc::OnOpenDocument (LPCTSTR path)
 {
 	::Get_Main_View ()->Allow_Repaint (false);
 
-	DWORD start_time = ::GetTickCount ();
+	DWORD start_time = ::TIMEGETTIME ();
 	
 	//
 	// Start a new document
@@ -848,7 +848,7 @@ CLevelEditDoc::OnOpenDocument (LPCTSTR path)
 	//	Load the level load time
 	//
 	CString load_time_message;
-	load_time_message.Format ("Level load took %d seconds\r\n", int((::GetTickCount () - start_time) / 1000));
+	load_time_message.Format ("Level load took %d seconds\r\n", int((::TIMEGETTIME () - start_time) / 1000));
 	::Output_Message (load_time_message);
 		
 	::Get_Main_View ()->Allow_Repaint (true);
diff --git a/Code/Tools/LevelEdit/MainFrm.cpp b/Code/Tools/LevelEdit/MainFrm.cpp
@@ -2070,8 +2070,8 @@ CMainFrame::OnAniStop (void)
 void
 CMainFrame::Update_Poly_Count (void)
 {
-	static DWORD last_update = ::GetTickCount ();
-	DWORD current_ticks = ::GetTickCount ();
+	static DWORD last_update = ::TIMEGETTIME ();
+	DWORD current_ticks = ::TIMEGETTIME ();
 
 	if ((current_ticks - last_update) > 500) {
 		CString message;
@@ -2092,8 +2092,8 @@ CMainFrame::Update_Poly_Count (void)
 void
 CMainFrame::Update_Texture_Mem (void)
 {
-	static DWORD last_update = ::GetTickCount ();
-	DWORD current_ticks = ::GetTickCount ();
+	static DWORD last_update = ::TIMEGETTIME ();
+	DWORD current_ticks = ::TIMEGETTIME ();
 
 	if ((current_ticks - last_update) > 500) {
 
@@ -4311,7 +4311,7 @@ CMainFrame::OnUpdateDecreaseSphere (CCmdUI *pCmdUI)
 void
 CMainFrame::Adjust_Growth_Rate (void)
 {
-	DWORD curr_time = ::GetTickCount ();
+	DWORD curr_time = ::TIMEGETTIME ();
 	
 	//
 	//	Reset the growth rate if too much time has elapsed
diff --git a/Code/Tools/LevelEdit/PathfindSectorBuilder.cpp b/Code/Tools/LevelEdit/PathfindSectorBuilder.cpp
@@ -487,13 +487,13 @@ PathfindSectorBuilderClass::Compress_Sectors_For_Pathfind (void)
 	//
 	//	Compress the sectors into the largest possible rectangular regions
 	//
-	DWORD before_ticks = ::GetTickCount ();
+	DWORD before_ticks = ::TIMEGETTIME ();
 	
 	Post_Process_Floodfill_For_Level_Features ();
 	Compress_Sectors ();
 	Generate_Portals ();
 
-	DWORD after_ticks = ::GetTickCount ();
+	DWORD after_ticks = ::TIMEGETTIME ();
 
 	WWDEBUG_SAY(("Time spent compressing: %d secs.\r\n", (after_ticks-before_ticks)/1000));
 	
@@ -1253,7 +1253,7 @@ PathfindSectorBuilderClass::Determine_Height
 int
 PathfindSectorBuilderClass::Build_Height_Values (void)
 {
-	int before_ticks = ::GetTickCount ();
+	int before_ticks = ::TIMEGETTIME ();
 	int total_box_count = 0;
 	int box_count = 0;
 
@@ -1276,7 +1276,7 @@ PathfindSectorBuilderClass::Build_Height_Values (void)
 		total_box_count ++;
 	}
 
-	int after_ticks = ::GetTickCount ();
+	int after_ticks = ::TIMEGETTIME ();
 	WWDEBUG_SAY(("Time spent generating z-values: %d secs.\r\n", (after_ticks-before_ticks)/1000));
 
 	return total_box_count;
diff --git a/Code/Tools/LevelEdit/TransitionEditDialog.cpp b/Code/Tools/LevelEdit/TransitionEditDialog.cpp
@@ -1373,7 +1373,7 @@ void
 TransitionEditDialogClass::OnAniPlay (void)
 {
 	m_IsAnimating		= true;
-	m_LastAnimUpdate	= ::GetTickCount ();
+	m_LastAnimUpdate	= ::TIMEGETTIME ();
 	return ;
 }
 
@@ -1402,7 +1402,7 @@ void
 TransitionEditDialogClass::Update_Animation (void)
 {
 	if (m_IsAnimating) {
-		DWORD curr_ticks = ::GetTickCount ();		
+		DWORD curr_ticks = ::TIMEGETTIME ();		
 		
 		float seconds		= float((curr_ticks - m_LastAnimUpdate)/1000.0F);
 		float frame_inc	= seconds * m_Animation->Get_Frame_Rate ();
diff --git a/Code/Tools/LevelEdit/VisMgr.cpp b/Code/Tools/LevelEdit/VisMgr.cpp
@@ -372,7 +372,7 @@ VisMgrClass::Render_Manual_Vis_Points
 	//	
 	for (int index = 0; index < point_list.Count (); index ++)
 	{
-		DWORD before = ::GetTickCount ();
+		DWORD before = ::TIMEGETTIME ();
 		VisPointNodeClass *vis_point = point_list[index];
 
 		//	Set the camera up to use the same settings we used when
@@ -410,7 +410,7 @@ VisMgrClass::Render_Manual_Vis_Points
 		//	Notify the callback that we've renedered a point
 		//				
 		if (callback != NULL) {
-			DWORD after	= ::GetTickCount ();		
+			DWORD after	= ::TIMEGETTIME ();		
 			keep_going	= (*callback) (after - before, param);
 		}
 	}
diff --git a/Code/Tools/LevelEdit/VisPointGenerator.cpp b/Code/Tools/LevelEdit/VisPointGenerator.cpp
@@ -269,7 +269,7 @@ VisPointGeneratorClass::Determine_Granularity (MeshClass &mesh)
 void
 VisPointGeneratorClass::Submit_Mesh (MeshClass &mesh)
 {
-	DWORD start_ticks = ::GetTickCount ();
+	DWORD start_ticks = ::TIMEGETTIME ();
 
 	//
 	//	Make sure we use the right granularity for this mesh
@@ -366,7 +366,7 @@ VisPointGeneratorClass::Submit_Mesh (MeshClass &mesh)
 
 	MEMBER_RELEASE (model);
 	
-	//DWORD before_collection = ::GetTickCount ();
+	//DWORD before_collection = ::TIMEGETTIME ();
 
 	//
 	//	Add all the vis points from the grid to the global list.
@@ -409,7 +409,7 @@ VisPointGeneratorClass::Submit_Mesh (MeshClass &mesh)
 		}
 	}
 	
-	/*DWORD finished_ticks = ::GetTickCount ();
+	/*DWORD finished_ticks = ::TIMEGETTIME ();
 	
 	if (m_StatWindow != NULL) {
 		CString stats;
diff --git a/Code/Tools/W3DView/GraphicView.cpp b/Code/Tools/W3DView/GraphicView.cpp
@@ -170,7 +170,7 @@ CGraphicView::OnCreate (LPCREATESTRUCT lpCreateStruct)
     if (CView::OnCreate(lpCreateStruct) == -1)
 		return -1;
 
-    m_dwLastFrameUpdate = timeGetTime ();//::GetTickCount ();	
+    m_dwLastFrameUpdate = timeGetTime ();//::TIMEGETTIME ();	
 	return 0;
 }
 
diff --git a/Code/Tools/W3DView/GraphicView.h b/Code/Tools/W3DView/GraphicView.h
@@ -155,7 +155,7 @@ class CGraphicView : public CView
         void			SetActiveUpdate (BOOL bActive)
 								{ m_bActive = bActive;
 								  if (!m_bActive) { ::SetProp (m_hWnd, "Inactive", (HANDLE)1); }
-								  else { RemoveProp (m_hWnd, "Inactive"); m_dwLastFrameUpdate = ::GetTickCount (); }
+								  else { RemoveProp (m_hWnd, "Inactive"); m_dwLastFrameUpdate = ::TIMEGETTIME (); }
 								}
 
 			void			Allow_Update (bool onoff);
diff --git a/Code/Tools/W3DView/MainFrm.cpp b/Code/Tools/W3DView/MainFrm.cpp
@@ -1081,7 +1081,7 @@ CMainFrame::Update_Frame_Time (DWORD clocks)
 	frames ++;
 
 	//if (frames >= 20) {
-	if ((::GetTickCount () - last_update) >= 1000) {
+	if ((::TIMEGETTIME () - last_update) >= 1000) {
 		
 		//
 		//	Average the frame time
@@ -1097,7 +1097,7 @@ CMainFrame::Update_Frame_Time (DWORD clocks)
 
 		frames = 0;
 		total_clocks = 0;
-		last_update = ::GetTickCount ();
+		last_update = ::TIMEGETTIME ();
 	}
 			
 	// Update the resolution display
diff --git a/Code/Tools/vidinit/SurrenderWnd.cpp b/Code/Tools/vidinit/SurrenderWnd.cpp
diff --git a/Code/ww3d2/animatedsoundmgr.cpp b/Code/ww3d2/animatedsoundmgr.cpp

Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ int main(int argc, char* argv[])`
`754`	`754`	`{`
`755`	`755`	`CGameSpyQnR mygame1("Test Game Server 1"), mygame2("Test Game Server 2");`
`756`	`756`
`757`		`- srand( GetTickCount() );`
	`757`	`+ srand( TIMEGETTIME() );`
`758`	`758`
`759`	`759`	`printf("Press any key to quit\n");`
`760`	`760`	`while (!_kbhit())`