Merge branch 'main' into feature/icu

Author: rm5248

.github/workflows/openw3d.yml

@@ -20,23 +20,26 @@ jobs:
         include:
           - name: MSVC x86
             os: windows-latest
-            cmake-args: -A Win32
+            cmake-args: -GNinja -DCMAKE_BUILD_TYPE=Release
             shell: pwsh
+            arch: x86
+            options: "/W4;/WX;/wd4456;/wd4702;/wd4100;/wd4505;/wd4389;/wd5054;/wd4840"
           - name: MSVC x64
             os: windows-latest
-            cmake-args: -A x64
+            cmake-args: -GNinja -DCMAKE_BUILD_TYPE=Release
             shell: pwsh
+            arch: x64
           - name: MinGW x86
             os: windows-latest
-            cmake-args: -DW3D_BUILD_OPTION_FFMPEG=ON -GNinja
+            cmake-args: -DW3D_BUILD_OPTION_FFMPEG=ON -GNinja -DCMAKE_BUILD_TYPE=Release
             build-args: --target combat combate renegade renegadeserver ww3d2e wwaudioe wwphyse
             msys2: true
             msys2-msystem: mingw32
             msys2-env: mingw-w64-i686
             shell: msys2 {0}
           - name: MinGW x64
             os: windows-latest
-            cmake-args: -DW3D_BUILD_OPTION_FFMPEG=ON -GNinja
+            cmake-args: -DW3D_BUILD_OPTION_FFMPEG=ON -GNinja -DCMAKE_BUILD_TYPE=Release
             build-args: --target combat combate renegade renegadeserver ww3d2e wwaudioe wwphyse
             msys2: true
             msys2-msystem: mingw64
@@ -70,8 +73,15 @@ jobs:
           ${{ matrix.msys2-env }}-ffmpeg
           ${{ matrix.msys2-env }}-ninja
           ${{ matrix.msys2-env }}-pkg-config
+    - name: 'Set up MSVC dev cmd'
+      if: ${{ !matrix.msys2 }}
+      uses: ilammy/msvc-dev-cmd@v1.13.0
+      with:
+        arch: ${{ matrix.arch }}
     - uses: actions/checkout@v5
     - name: 'CMake (configure)'
+      env:
+        W3D_COMPILER_FLAGS:  ${{ matrix.options }}
       run: |
         cmake -S . -B build ${{ matrix.cmake-args }}
     - name: 'CMake (build)'

Code/Combat/backgroundmgr.cpp

@@ -1619,14 +1619,14 @@ LightningBoltClass::LightningBoltClass (int branchcount, Matrix3D &m, float leng
 		const float amplitudefactor = 0.85f;
 
 		float	oobranchcount;
-		int	branchcount;
+		int	lbbranchcount;
 		float	minlength, maxlength, w, a;
 
 		Branches = new BranchStruct [BranchCount];
 		WWASSERT (Branches != NULL);
 		oobranchcount = 1.0f / BranchCount;
 		branchrandomness = vertexcount / (BranchCount * 2);
-		branchcount = BranchCount * branchfactor;
+		lbbranchcount = BranchCount * branchfactor;
 		minlength = childlength * minlengthfactor;
 		maxlength = childlength * maxlengthfactor;
 		w = MAX (minwidth, width * widthfactor);
@@ -1646,7 +1646,7 @@ LightningBoltClass::LightningBoltClass (int branchcount, Matrix3D &m, float leng
 
 			// If the lightning bolt originates below the horizon don't bother generating it.
 			if (m0.Get_Translation().Z > 0.0f) {
-				Branches [b].LightningBolt = NEW_REF (LightningBoltClass, (branchcount, m0, l, l, w, a));
+				Branches [b].LightningBolt = NEW_REF (LightningBoltClass, (lbbranchcount, m0, l, l, w, a));
 			} else {
 				Branches [b].LightningBolt = NULL;
 			}

Code/Combat/humanstate.cpp

@@ -1433,10 +1433,10 @@ void	HumanStateClass::Begin_Jump( void )
 void	HumanStateClass::Complete_Jump( void )
 {
 	Vector3 fall = JumpTM.Get_Translation() - HumanPhys->Get_Transform().Get_Translation();
-	GlobalSettingsDef * settings = GlobalSettingsDef::Get_Global_Settings();
+	[[maybe_unused]] GlobalSettingsDef * settings = GlobalSettingsDef::Get_Global_Settings();
 //	Debug_Say(( "Fall Distance %f\n", fall.Z ));
 
-	bool add_portal = true;
+	[[maybe_unused]] bool add_portal = true;
 
 //
 //	Don't do this in the level editor

Code/Combat/repairbaygameobj.cpp

@@ -674,8 +674,6 @@ RepairBayGameObj::Repair_Vehicle (void)
 				if (	driver != NULL && 
 						driver->Get_Player_Type () == BaseController->Get_Player_Type() )
 				{
-					PlayerDataClass *player_data = driver->Get_Player_Data ();
-
 					float shield_max	= vehicle->Get_Defense_Object ()->Get_Shield_Strength_Max ();
 					float health_max	= vehicle->Get_Defense_Object ()->Get_Health_Max ();
 					float curr_health	= vehicle->Get_Defense_Object ()->Get_Health ();
@@ -697,22 +695,16 @@ RepairBayGameObj::Repair_Vehicle (void)
 					int damage_points				= (int)std::min (repair_rate, total_damage);
 					float repair_cost_per_pt	= vehicle_cost / (health_max + shield_max);
 
-					//int available_funds			= 1000; //player_data->Get_Score ()
 // FIXME (TSS) available_funds			= 1000 looks suspect...
-					int available_funds			= 1000; //player_data->Get_Money ()
+					int available_funds			= 1000;
 
 					int points_restored			= int(available_funds / repair_cost_per_pt);
 					points_restored				= std::max (points_restored, 0);
 					points_restored				= std::min (points_restored, damage_points);
-					float total_cost			= points_restored * repair_cost_per_pt;
 
 					int health_restored			= std::min (int(health_max - curr_health), points_restored);
 					int shield_restored			= std::min (int(shield_max - curr_shield), (points_restored - health_restored));
 
-					//
-					//	Debit the player's account
-					//
-					//player_data->Purchase_Item (total_cost);
 					is_repairing = true;
 
 					//

Code/Combat/staticnetworkobject.cpp

@@ -799,13 +799,13 @@ DSAPONetworkObjectClass::Initialize (StaticAnimPhysClass *phys_obj)
 	//	Get a pointer to the object
 	//
 	if (PhysObj != NULL) {
-		DamageableStaticPhysClass *phys_obj = PhysObj->As_DamageableStaticPhysClass ();
-		if (phys_obj != NULL) {
+		DamageableStaticPhysClass *dsphys_obj = PhysObj->As_DamageableStaticPhysClass ();
+		if (dsphys_obj != NULL) {
 
 			//
 			//	Copy the object's state
 			//
-			Health = phys_obj->DefenseObject.Get_Health ();
+			Health = dsphys_obj->DefenseObject.Get_Health ();
 		}
 	}
 

Code/Commando/AutoStart.cpp

@@ -296,9 +296,9 @@ void AutoRestartClass::Think(void)
 							}
 							LogonAction = (WOLLogonAction) -1;
 							WOLLogonMgr::Set_Quiet_Mode(true);
-							RefPtr<WWOnline::Session> WOLSession = WWOnline::Session::GetInstance(true);
-							if (WOLSession.IsValid()) {
-								Observer<WWOnline::ServerError>::NotifyMe(*WOLSession);
+							RefPtr<WWOnline::Session> wol_session = WWOnline::Session::GetInstance(true);
+							if (wol_session.IsValid()) {
+								Observer<WWOnline::ServerError>::NotifyMe(*wol_session);
 								WOLLogonMgr::Logon(this);
 								RestartState = STATE_LOGIN;
 							} else {

Code/Commando/WOLBuddyMgr.cpp

@@ -1263,8 +1263,8 @@ void WOLBuddyMgr::HandleNotification(BuddyEvent& event)
 	if (listChanged)
 		{
 		Add_Ref();
-		WOLBuddyMgrEvent event(BUDDYLIST_CHANGED, this);
-		NotifyObservers(event);
+		WOLBuddyMgrEvent change_event(BUDDYLIST_CHANGED, this);
+		NotifyObservers(change_event);
 		Release_Ref();
 		}
 	}
@@ -1331,8 +1331,8 @@ void WOLBuddyMgr::HandleNotification(UserEvent& event)
 			if (IsBuddy(username))
 				{
 				Add_Ref();
-				WOLBuddyMgrEvent event(BUDDYINFO_CHANGED, this);
-				NotifyObservers(event);
+				WOLBuddyMgrEvent change_event(BUDDYINFO_CHANGED, this);
+				NotifyObservers(change_event);
 				Release_Ref();
 				}
 			}
@@ -1343,8 +1343,8 @@ void WOLBuddyMgr::HandleNotification(UserEvent& event)
 			if (IsBuddy(event.Subject()->GetName()))
 				{
 				Add_Ref();
-				WOLBuddyMgrEvent event(BUDDYINFO_CHANGED, this);
-				NotifyObservers(event);
+				WOLBuddyMgrEvent change_event(BUDDYINFO_CHANGED, this);
+				NotifyObservers(change_event);
 				Release_Ref();
 				}
 		break;

Code/Commando/WOLChatMgr.cpp

@@ -1042,8 +1042,8 @@ void WOLChatMgr::HandleNotification(ChannelListEvent& event)
 			}
 
 		Add_Ref();
-		WOLChatMgrEvent event = LobbyListChanged;
-		NotifyObservers(event);
+		WOLChatMgrEvent change_event = LobbyListChanged;
+		NotifyObservers(change_event);
 		Release_Ref();
 		}
 	}
@@ -1092,26 +1092,26 @@ void WOLChatMgr::HandleNotification(ChannelEvent& event)
 			AddMessage(NULL, message, true, true);
 
 			Add_Ref();
-			WOLChatMgrEvent event = LobbyChanged;
-			NotifyObservers(event);
+			WOLChatMgrEvent change_event = LobbyChanged;
+			NotifyObservers(change_event);
 			Release_Ref();
 			}
 			break;
 
 		case ChannelBanned:
 			{
 			Add_Ref();
-			WOLChatMgrEvent event = BannedFromChannel;
-			NotifyObservers(event);
+			WOLChatMgrEvent ban_event = BannedFromChannel;
+			NotifyObservers(ban_event);
 			Release_Ref();
 			}
 			break;
 
 		case ChannelKicked:
 			{
 			Add_Ref();
-			WOLChatMgrEvent event = KickedFromChannel;
-			NotifyObservers(event);
+			WOLChatMgrEvent kick_event = KickedFromChannel;
+			NotifyObservers(kick_event);
 			Release_Ref();
 			}
 			break;

Code/Commando/WebBrowser.cpp

@@ -1104,8 +1104,8 @@ bool WebBrowser::LaunchExternal(const char* url)
 
 	memset(&mProcessInfo, 0, sizeof(mProcessInfo));
 
-	BOOL createSuccess = CreateProcessA(exeName, commandLine, NULL, NULL, false,
-			0, NULL, NULL, &startupInfo, &mProcessInfo);
+	bool createSuccess = CreateProcessA(exeName, commandLine, NULL, NULL, false,
+			0, NULL, NULL, &startupInfo, &mProcessInfo) != 0;
 
 	WWASSERT(createSuccess && "Failed to launch external WebBrowser.");
 
@@ -1114,7 +1114,7 @@ bool WebBrowser::LaunchExternal(const char* url)
 	  WaitForInputIdle(mProcessInfo.hProcess, 5000);
 		}
 
-	return (true == createSuccess);
+	return createSuccess;
 	}
 
 

Code/Commando/console.cpp

@@ -1702,18 +1702,18 @@ void	ConsoleGameModeClass::Update_Memory_Log( void )
 	const float OOMEGABYTE = 1.0f / MEGABYTE;
 
 	StringClass	memory_string(2048);
-	StringClass working_string(true);
+	StringClass temp_string(true);
 
 	memory_string.Format("Memory Category     Current(Mb)    Peak(Mb)\n");
 	int total = 0;
 	for (int i=0; i<WWMemoryLogClass::Get_Category_Count(); i++) {
 
 		// (gth) to compute Mb should I divide by the nearest power of two to a million?
-		working_string.Format("%-18s  %-10.2f     %-10.2f\r\n",
+		temp_string.Format("%-18s  %-10.2f     %-10.2f\r\n",
 										WWMemoryLogClass::Get_Category_Name(i),
 										(float)WWMemoryLogClass::Get_Current_Allocated_Memory(i) * OOMEGABYTE,
 										(float)WWMemoryLogClass::Get_Peak_Allocated_Memory(i) * OOMEGABYTE);
-		memory_string += working_string;
+		memory_string += temp_string;
 		total += WWMemoryLogClass::Get_Current_Allocated_Memory(i);
 	}
 
@@ -1724,30 +1724,30 @@ void	ConsoleGameModeClass::Update_Memory_Log( void )
 	memory_string += working_string;
 #endif
 
-	working_string.Format("SUB TOTAL:          %-10.2f\r\n\r\n",(float)total * OOMEGABYTE);
-	memory_string += working_string;
+	temp_string.Format("SUB TOTAL:          %-10.2f\r\n\r\n",(float)total * OOMEGABYTE);
+	memory_string += temp_string;
 
 	// display the estimated space used by textures residing in system ram
 	int tex_size=TextureClass::_Get_Total_Texture_Size();
-	working_string.Format("%-18s  %-10.2f\r\n","Textures(est)",(float)tex_size * OOMEGABYTE);
-	memory_string += working_string;
+	temp_string.Format("%-18s  %-10.2f\r\n","Textures(est)",(float)tex_size * OOMEGABYTE);
+	memory_string += temp_string;
 	total+=tex_size;
 
 	// display estimated vertex buffer space
 	unsigned vb_size=VertexBufferClass::Get_Total_Allocated_Memory();
-	working_string.Format("%-18s  %-10.2f\r\n","Vertex Buffers(est)",(float)vb_size * OOMEGABYTE);
-	memory_string += working_string;
+	temp_string.Format("%-18s  %-10.2f\r\n","Vertex Buffers(est)",(float)vb_size * OOMEGABYTE);
+	memory_string += temp_string;
 	total+=vb_size;
 
 	// display estimated index buffer space
 	unsigned ib_size=IndexBufferClass::Get_Total_Allocated_Memory();
-	working_string.Format("%-18s  %-10.2f\r\n","Index Buffers(est)",(float)ib_size * OOMEGABYTE);
-	memory_string += working_string;
+	temp_string.Format("%-18s  %-10.2f\r\n","Index Buffers(est)",(float)ib_size * OOMEGABYTE);
+	memory_string += temp_string;
 	total+=ib_size;
 
 	// total!
-	working_string.Format("TOTAL:              %-10.2f\r\n\r\n",(float)total * OOMEGABYTE);
-	memory_string += working_string;
+	temp_string.Format("TOTAL:              %-10.2f\r\n\r\n",(float)total * OOMEGABYTE);
+	memory_string += temp_string;
 
 	StatisticsDisplayManager::Set_Stat( "memory", memory_string, 0xffffffff );
 }