Skip to content

Commit

Permalink
Fix R4 compilation!
Browse files Browse the repository at this point in the history
R3 is still broken
  • Loading branch information
Xottab-DUTY committed Aug 8, 2017
1 parent 2a78a45 commit 5e9115a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/Layers/xrRenderDX10/dx10DetailManager_VS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ void CDetailManager::hw_Render_dump(
for (; _vI != _vE; _vI++)
{
SlotItemVec* items = *_vI;

SlotItemVecIt _iI = items->begin();
SlotItemVecIt _iE = items->end();
for (; _iI != _iE; _iI++)
Expand Down Expand Up @@ -216,7 +217,7 @@ void CDetailManager::hw_Render_dump(
}
}
}
// flush if nessecary
// flush if necessary
if (dwBatch)
{
RImplementation.BasicStats.DetailCount += dwBatch;
Expand Down
9 changes: 5 additions & 4 deletions src/Layers/xrRenderPC_R4/r4_R_sun.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ struct DumbClipper
{
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);
}

Fbox clipped_AABB(xr_vector<Fbox, render_alloc<Fbox3>>& src, Fmatrix& xf)
{
Fbox3 result;
Expand Down Expand Up @@ -963,10 +964,10 @@ void CRender::render_sun_near()
scissor.modify(xf);
}
s32 limit = RImplementation.o.smapsize - 1;
fuckingsun->X.D.vMinX = clampr(iFloor(scissor.vMin.x), 0, limit);
fuckingsun->X.D.vMaxX = clampr(iCeil(scissor.vMax.x), 0, limit);
fuckingsun->X.D.vMinY = clampr(iFloor(scissor.vMin.y), 0, limit);
fuckingsun->X.D.vMaxY = clampr(iCeil(scissor.vMax.y), 0, limit);
fuckingsun->X.D.minX = clampr(iFloor(scissor.vMin.x), 0, limit);
fuckingsun->X.D.maxX = clampr(iCeil(scissor.vMax.x), 0, limit);
fuckingsun->X.D.minY = clampr(iFloor(scissor.vMin.y), 0, limit);
fuckingsun->X.D.maxY = clampr(iCeil(scissor.vMax.y), 0, limit);

// full-xform
FPU::m24r();
Expand Down

0 comments on commit 5e9115a

Please sign in to comment.