[GEN][ZH] Remove bogus calls to memset (#1323)

xezon · web-flow · commit 4cc109ad53a3 · 2025-07-22T20:59:34.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
@@ -2389,7 +2389,6 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 	if (!masterParticleSystem || !slaveParticleSystem) {
 		DEBUG_CRASH(("masterParticleSystem or slaveParticleSystem was NULL. Should not happen. JKMCD"));
 		ParticleInfo bogus;
-		memset( &bogus, 0, sizeof( bogus ) );
 		return bogus;
 	}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp
@@ -2299,7 +2299,6 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master
 	if (!masterParticleSystem || !slaveParticleSystem) {
 		DEBUG_CRASH(("masterParticleSystem or slaveParticleSystem was NULL. Should not happen. JKMCD"));
 		ParticleInfo bogus;
-		memset( &bogus, 0, sizeof( bogus ) );
 		return bogus;
 	}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DPropBuffer.cpp
@@ -114,7 +114,6 @@ for the props. */
 //=============================================================================
 W3DPropBuffer::W3DPropBuffer(void)
 {
-	memset(this, sizeof(W3DPropBuffer), 0);
 	m_initialized = false;
 	m_numProps = 0;
 	m_numPropTypes = 0;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
@@ -1095,7 +1095,6 @@ for the trees. */
 //=============================================================================
 W3DTreeBuffer::W3DTreeBuffer(void)
 {
-	memset(this, sizeof(W3DTreeBuffer), 0);
 	m_initialized = false;
 	Int i;
 	for	(i=0; i<MAX_BUFFERS; i++) {

Original file line number	Diff line number	Diff line change
`@@ -2389,7 +2389,6 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master`
`2389`	`2389`	`if (!masterParticleSystem \|\| !slaveParticleSystem) {`
`2390`	`2390`	`DEBUG_CRASH(("masterParticleSystem or slaveParticleSystem was NULL. Should not happen. JKMCD"));`
`2391`	`2391`	`ParticleInfo bogus;`
`2392`		`- memset( &bogus, 0, sizeof( bogus ) );`
`2393`	`2392`	`return bogus;`
`2394`	`2393`	`}`
`2395`	`2394`
Original file line number	Diff line number	Diff line change
`@@ -2299,7 +2299,6 @@ ParticleInfo ParticleSystem::mergeRelatedParticleSystems( ParticleSystem *master`
`2299`	`2299`	`if (!masterParticleSystem \|\| !slaveParticleSystem) {`
`2300`	`2300`	`DEBUG_CRASH(("masterParticleSystem or slaveParticleSystem was NULL. Should not happen. JKMCD"));`
`2301`	`2301`	`ParticleInfo bogus;`
`2302`		`- memset( &bogus, 0, sizeof( bogus ) );`
`2303`	`2302`	`return bogus;`
`2304`	`2303`	`}`
`2305`	`2304`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ for the props. */`
`114`	`114`	`//=============================================================================`
`115`	`115`	`W3DPropBuffer::W3DPropBuffer(void)`
`116`	`116`	`{`
`117`		`- memset(this, sizeof(W3DPropBuffer), 0);`
`118`	`117`	`m_initialized = false;`
`119`	`118`	`m_numProps = 0;`
`120`	`119`	`m_numPropTypes = 0;`
Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,6 @@ for the trees. */`
`1095`	`1095`	`//=============================================================================`
`1096`	`1096`	`W3DTreeBuffer::W3DTreeBuffer(void)`
`1097`	`1097`	`{`
`1098`		`- memset(this, sizeof(W3DTreeBuffer), 0);`
`1099`	`1098`	`m_initialized = false;`
`1100`	`1099`	`Int i;`
`1101`	`1100`	`for (i=0; i<MAX_BUFFERS; i++) {`