Skip to content

Commit 2b9d931

Browse files
author
nitrocaster
committed
Max_Material_60: Fix conformance in For loop scope (#104).
1 parent 4fff282 commit 2b9d931

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/plugins/Shared/GameMaterial.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ XRayMtl::XRayMtl(BOOL loading) : mReshadeRQ(RR_None), mInRQ(RR_None) // mjm - 06
12391239
for ( int i = 0; i < 12; ++i )
12401240
stdIDToChannel[i] = -1;
12411241

1242-
for ( i = 0; i < STD2_NMAX_TEXMAPS; ++i )
1242+
for (int i = 0; i < STD2_NMAX_TEXMAPS; ++i )
12431243
channelTypes[i] = UNSUPPORTED_CHANNEL;
12441244

12451245
ivalid.SetEmpty();
@@ -1312,7 +1312,7 @@ RefTargetHandle XRayMtl::Clone(RemapDir &remap) {
13121312
for ( int i = 0; i < 12; ++i )
13131313
mnew->stdIDToChannel[i] = stdIDToChannel[i];
13141314

1315-
for ( i = 0; i < STD2_NMAX_TEXMAPS; ++i )
1315+
for (int i = 0; i < STD2_NMAX_TEXMAPS; ++i )
13161316
mnew->channelTypes[i] = channelTypes[i];
13171317
macroRecorder->Enable();
13181318
BaseClone(this, mnew, remap);
@@ -1952,7 +1952,7 @@ void XRayMtl::UpdateTexmaps()
19521952
}
19531953

19541954
// last do the Channel Ids from stdMat
1955-
for ( i = 0; i < N_ID_CHANNELS; ++i ){
1955+
for (long i = 0; i < N_ID_CHANNELS; ++i ){
19561956
int chan = pShader->StdIDToChannel(i);
19571957
if ( chan >= 0 ) {
19581958
stdIDToChannel[i] = chan;
@@ -2232,7 +2232,8 @@ void XRayMtl::ShuffleTexMaps( Shader* newShader, Shader* oldShader )
22322232
int nNewShadeMaps = newShader->nTexChannelsSupported();
22332233

22342234
// for each new shader map
2235-
for( int oldChan, newChan = 0; newChan < nNewShadeMaps; ++newChan ){
2235+
int oldChan, newChan = 0;
2236+
for(; newChan < nNewShadeMaps; ++newChan ){
22362237

22372238
TSTR newName = newShader->GetTexChannelInternalName(newChan);
22382239

@@ -3762,7 +3763,7 @@ IllumParams* CloneIp( IllumParams& ip )
37623763
pClone->refractAmt = ip.refractAmt;
37633764
pClone->reflectAmt = ip.reflectAmt;
37643765

3765-
for( i=0; i < STD2_NMAX_TEXMAPS; ++i )
3766+
for(int i=0; i < STD2_NMAX_TEXMAPS; ++i )
37663767
pClone->channels[ i ] = ip.channels[ i ];
37673768

37683769
return pClone;
@@ -4156,7 +4157,7 @@ void XRayMtl::SetupGfxMultiMaps(TimeValue t, Material *mtl, MtlMakerCallback &cb
41564157
mtl->texture.SetCount(nmaps);
41574158
if (nmaps==0)
41584159
return;
4159-
for (i=0; i<nmaps; i++)
4160+
for (int i=0; i<nmaps; i++)
41604161
mtl->texture[i].textHandle = NULL;
41614162
texHandleValid.SetInfinite();
41624163
Interval valid;

src/plugins/Shared/TexMaps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ IOResult Texmaps::Save(ISave *isave) {
217217
isave->Write(&f,sizeof(f),&nb);
218218
isave->EndChunk();
219219

220-
for ( i=0; i<STD2_NMAX_TEXMAPS; i++) {
220+
for (int i=0; i<STD2_NMAX_TEXMAPS; i++) {
221221
if (txmap[i].amount!=1.0f) {
222222
isave->BeginChunk(TEX_AMT0+i);
223223
isave->Write(&txmap[i].amount,sizeof(float),&nb);

0 commit comments

Comments
 (0)