Merge branch 'master' into jgrpp

# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
This commit is contained in:
Jonathan G Rennison
2023-09-15 20:44:22 +01:00
28 changed files with 160 additions and 198 deletions

View File

@@ -352,7 +352,10 @@ uint GetSpriteCountForFile(const std::string &filename, SpriteID begin, SpriteID
for (SpriteID i = begin; i != end; i++) {
if (SpriteExists(i)) {
SpriteCache *sc = GetSpriteCache(i);
if (sc->file == file) count++;
if (sc->file == file) {
count++;
DEBUG(sprite, 4, "Sprite: %u", i);
}
}
}
return count;
@@ -1024,7 +1027,7 @@ void IncreaseSpriteLRU()
/* Adjust all LRU values */
if (_sprite_lru_counter >= 0xC0000000) {
DEBUG(sprite, 3, "Fixing lru %u, inuse=" PRINTF_SIZE, _sprite_lru_counter, GetSpriteCacheUsage());
DEBUG(sprite, 5, "Fixing lru %u, inuse=" PRINTF_SIZE, _sprite_lru_counter, GetSpriteCacheUsage());
for (SpriteID i = 0; i != _spritecache.size(); i++) {
SpriteCache *sc = GetSpriteCache(i);