Skip to content

Commit 5e9115a

Browse files
committed
Fix R4 compilation!
R3 is still broken
1 parent 2a78a45 commit 5e9115a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/Layers/xrRenderDX10/dx10DetailManager_VS.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ void CDetailManager::hw_Render_dump(
167167
for (; _vI != _vE; _vI++)
168168
{
169169
SlotItemVec* items = *_vI;
170+
170171
SlotItemVecIt _iI = items->begin();
171172
SlotItemVecIt _iE = items->end();
172173
for (; _iI != _iE; _iI++)
@@ -216,7 +217,7 @@ void CDetailManager::hw_Render_dump(
216217
}
217218
}
218219
}
219-
// flush if nessecary
220+
// flush if necessary
220221
if (dwBatch)
221222
{
222223
RImplementation.BasicStats.DetailCount += dwBatch;

src/Layers/xrRenderPC_R4/r4_R_sun.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ struct DumbClipper
247247
{
248248
return D3DXVECTOR3((i & 1) ? bb.vMin.x : bb.vMax.x, (i & 2) ? bb.vMin.y : bb.vMax.y, (i & 4) ? bb.vMin.z : bb.vMax.z);
249249
}
250+
250251
Fbox clipped_AABB(xr_vector<Fbox, render_alloc<Fbox3>>& src, Fmatrix& xf)
251252
{
252253
Fbox3 result;
@@ -963,10 +964,10 @@ void CRender::render_sun_near()
963964
scissor.modify(xf);
964965
}
965966
s32 limit = RImplementation.o.smapsize - 1;
966-
fuckingsun->X.D.vMinX = clampr(iFloor(scissor.vMin.x), 0, limit);
967-
fuckingsun->X.D.vMaxX = clampr(iCeil(scissor.vMax.x), 0, limit);
968-
fuckingsun->X.D.vMinY = clampr(iFloor(scissor.vMin.y), 0, limit);
969-
fuckingsun->X.D.vMaxY = clampr(iCeil(scissor.vMax.y), 0, limit);
967+
fuckingsun->X.D.minX = clampr(iFloor(scissor.vMin.x), 0, limit);
968+
fuckingsun->X.D.maxX = clampr(iCeil(scissor.vMax.x), 0, limit);
969+
fuckingsun->X.D.minY = clampr(iFloor(scissor.vMin.y), 0, limit);
970+
fuckingsun->X.D.maxY = clampr(iCeil(scissor.vMax.y), 0, limit);
970971

971972
// full-xform
972973
FPU::m24r();

0 commit comments

Comments
 (0)