diff options
| author | aap <aap@papnet.eu> | 2021-02-09 20:02:29 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-02-09 20:02:29 +0100 |
| commit | 26bbbe003761490d16a75e4f4e06199e8bc47b70 (patch) | |
| tree | e8c3d35d89d49f04fc20a81268ab17995d0d5fc9 | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| download | re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.tar re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.tar.gz re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.tar.bz2 re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.tar.lz re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.tar.xz re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.tar.zst re3-26bbbe003761490d16a75e4f4e06199e8bc47b70.zip | |
| -rw-r--r-- | src/core/FileLoader.cpp | 1 | ||||
| -rw-r--r-- | src/render/Clouds.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index 4d1cd921..bf017256 100644 --- a/src/core/FileLoader.cpp +++ b/src/core/FileLoader.cpp @@ -317,6 +317,7 @@ CFileLoader::LoadCollisionModel(uint8 *buf, CColModel &model, char *modelname) buf += 4; if(model.numLines > 0){ //model.lines = (CColLine*)RwMalloc(model.numLines*sizeof(CColLine)); + REGISTER_MEMPTR(&model.lines); for(i = 0; i < model.numLines; i++){ //model.lines[i].Set(*(CVector*)buf, *(CVector*)(buf+12)); buf += 24; diff --git a/src/render/Clouds.cpp b/src/render/Clouds.cpp index c7554356..e3a8c86e 100644 --- a/src/render/Clouds.cpp +++ b/src/render/Clouds.cpp @@ -265,8 +265,8 @@ CClouds::Render(void) for(i = 0; i < 37; i++){ RwV3d pos = { 2.0f*CoorsOffsetX[i], 2.0f*CoorsOffsetY[i], 40.0f*CoorsOffsetZ[i] + 40.0f }; - worldpos.x = campos.x*rot_cos + campos.y*rot_sin + pos.x; - worldpos.y = campos.x*rot_sin + campos.y*rot_cos + pos.y; + worldpos.x = pos.x*rot_cos + pos.y*rot_sin + campos.x; + worldpos.y = pos.x*rot_sin + pos.y*rot_cos + campos.y; worldpos.z = pos.z; if(bCloudOnScreen[i] && CSprite::CalcScreenCoors(worldpos, &screenpos, &szx, &szy, false)){ if(sundist < SCREEN_WIDTH/3){ |