diff options
| -rw-r--r-- | src/fs/virtfs/fsdir.cpp | 8 | ||||
| -rw-r--r-- | src/fs/virtfs/fszip.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 3 | ||||
| -rw-r--r-- | src/net/ea/beingrecv.cpp | 3 | ||||
| -rw-r--r-- | src/resources/image/subimage.cpp | 3 | ||||
| -rw-r--r-- | src/resources/loaders/rescaledloader.cpp | 3 | ||||
| -rw-r--r-- | src/resources/loaders/xmlloader.cpp | 3 |
7 files changed, 9 insertions, 17 deletions
diff --git a/src/fs/virtfs/fsdir.cpp b/src/fs/virtfs/fsdir.cpp index be980ae65..f32cbba4b 100644 --- a/src/fs/virtfs/fsdir.cpp +++ b/src/fs/virtfs/fsdir.cpp @@ -76,8 +76,7 @@ namespace FsDir filename.c_str()); return nullptr; } - File *restrict const file = new File(&funcs, fd); - return file; + return new File(&funcs, fd); } File *openRead(FsEntry *restrict const entry, @@ -409,11 +408,10 @@ namespace FsDir return 0; } #ifdef USE_FILE_FOPEN - const int64_t pos = ftell(fd); + return ftell(fd); #else // USE_FILE_FOPEN - const int64_t pos = lseek(fd, 0, SEEK_CUR); + return lseek(fd, 0, SEEK_CUR); #endif // USE_FILE_FOPEN - return pos; } int seek(File *restrict const file, diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp index 148df66fc..fcb726173 100644 --- a/src/fs/virtfs/fszip.cpp +++ b/src/fs/virtfs/fszip.cpp @@ -557,10 +557,9 @@ namespace FsZip ZipReader::readFile(header); if (buf == nullptr) return nullptr; - File *restrict const file = new File(&funcs, + return new File(&funcs, buf, header->uncompressSize); - return file; } } return nullptr; diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 9fc6b6b38..27caa2019 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -934,9 +934,8 @@ InventoryWindow *InventoryWindow::getFirstVisible() if (((*it) != nullptr) && (*it)->isWindowVisible()) list.insert(*it); } - InventoryWindow *const window = dynamic_cast<InventoryWindow*>( + return dynamic_cast<InventoryWindow*>( windowContainer->findFirstWidget(list)); - return window; } void InventoryWindow::nextTab() diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp index bf7ae32ba..b2859d76f 100644 --- a/src/net/ea/beingrecv.cpp +++ b/src/net/ea/beingrecv.cpp @@ -513,9 +513,8 @@ Being *BeingRecv::createBeing(const BeingId id, else if (job == 45) type = ActorType::Portal; - Being *const being = actorManager->createBeing( + return actorManager->createBeing( id, type, fromInt(job, BeingTypeId)); - return being; } } // namespace Ea diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp index 9eda05164..0b14b788e 100644 --- a/src/resources/image/subimage.cpp +++ b/src/resources/image/subimage.cpp @@ -227,8 +227,7 @@ void SubImage::decRef() int SubImage::calcMemoryLocal() const { - int sz = static_cast<int>(sizeof(SubImage) + + return static_cast<int>(sizeof(SubImage) + sizeof(std::map<float, SDL_Surface*>)) + Resource::calcMemoryLocal(); - return sz; } diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp index cea73b382..e69814d27 100644 --- a/src/resources/loaders/rescaledloader.cpp +++ b/src/resources/loaders/rescaledloader.cpp @@ -71,7 +71,6 @@ Image *Loader::getRescaled(const Image *const image, const std::string idPath = image->mIdPath + strprintf( "_rescaled%dx%d", width, height); const RescaledLoader rl = { image, width, height }; - Image *const img = static_cast<Image *>( + return static_cast<Image *>( ResourceManager::get(idPath, RescaledLoader::load, &rl)); - return img; } diff --git a/src/resources/loaders/xmlloader.cpp b/src/resources/loaders/xmlloader.cpp index 2374e44d1..2d06d8128 100644 --- a/src/resources/loaders/xmlloader.cpp +++ b/src/resources/loaders/xmlloader.cpp @@ -44,10 +44,9 @@ namespace return nullptr; const ResourceLoader *const rl = static_cast<const ResourceLoader *>(v); - Resource *const res = new XML::Document(rl->path, + return new XML::Document(rl->path, rl->useResman, rl->skipError); - return res; } }; |