diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-10-25 18:53:05 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-10-25 18:53:05 +0100 |
| commit | 3bdc974ff5e05868351a007e37ceb7680c80e7bf (patch) | |
| tree | d3df03db52e3bcc8404b4036b594d2545eeec358 | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.tar re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.tar.gz re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.tar.bz2 re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.tar.lz re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.tar.xz re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.tar.zst re3-3bdc974ff5e05868351a007e37ceb7680c80e7bf.zip | |
| -rw-r--r-- | src/render/Glass.cpp | 8 | ||||
| m--------- | vendor/librw | 0 | ||||
| m--------- | vendor/opusfile | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp index 0e26ee0b..426fa7f1 100644 --- a/src/render/Glass.cpp +++ b/src/render/Glass.cpp @@ -668,7 +668,7 @@ CGlass::WindowRespondsToCollision(CEntity *entity, float amount, CVector speed, object->bGlassBroken = true; object->bIsVisible = false; - object->bUsesCollision = true; + object->bUsesCollision = false; } void @@ -868,11 +868,11 @@ CGlass::HasGlassBeenShatteredAtCoors(float x, float y, float z) CWorld::AdvanceCurrentScanCode(); - for ( int32 y = nStartY; y <= nEndY; y++ ) + for ( int32 ys = nStartY; ys <= nEndY; ys++ ) { - for ( int32 x = nStartX; x <= nEndX; x++ ) + for ( int32 xs = nStartX; xs <= nEndX; xs++ ) { - CSector *sector = CWorld::GetSector(x, y); + CSector *sector = CWorld::GetSector(xs, ys); ASSERT(sector != nil); diff --git a/vendor/librw b/vendor/librw -Subproject ee2a32e142fa2d2a1bb6c4fed0c25c2f1e5a112 +Subproject 5e5a624681a268e759df53edc15a73f587fda6d diff --git a/vendor/opusfile b/vendor/opusfile -Subproject f94a1764b0dcdd84ee8c13c040de9f4c1a67e4d +Subproject 4174c26e0aaab19d01afdea0a46f7f95fdc6b3e |