Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 19:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source 
* fix filestream read
* fix transparent minimap
This commit is contained in:
Eduardo Bart
2012-04-27 19:17:51 -03:00
parent 220701e90f
commit b75483e9bf
4 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/framework/core/filestream.cpp
View File

@@ -158,7 +158,7 @@ uint8 FileStream::getU8()
if(PHYSFS_read(m_fileHandle, &v, 1, 1) != 1)
logTraceError("operation failed on '", m_name, "': ", PHYSFS_getLastError());
} else {
if(m_cacheReadPos+1 >= m_cacheBuffer.size()) {
if(m_cacheReadPos+1 > m_cacheBuffer.size()) {
logTraceError("operation failed on '", m_name, "': reached file eof");
return 0;
}
@@ -176,7 +176,7 @@ uint16 FileStream::getU16()
if(PHYSFS_readULE16(m_fileHandle, &v) == 0)
logTraceError("operation failed on '", m_name, "': ", PHYSFS_getLastError());
} else {
if(m_cacheReadPos+2 >= m_cacheBuffer.size()) {
if(m_cacheReadPos+2 > m_cacheBuffer.size()) {
logTraceError("operation failed on '", m_name, "': reached file eof");
return 0;
}
@@ -194,7 +194,7 @@ uint32 FileStream::getU32()
if(PHYSFS_readULE32(m_fileHandle, &v) == 0)
logTraceError("operation failed on '", m_name, "': ", PHYSFS_getLastError());
} else {
if(m_cacheReadPos+4 >= m_cacheBuffer.size()) {
if(m_cacheReadPos+4 > m_cacheBuffer.size()) {
logTraceError("operation failed on '", m_name, "': reached file eof");
return 0;
}
@@ -212,7 +212,7 @@ uint64 FileStream::getU64()
if(PHYSFS_readULE64(m_fileHandle, (PHYSFS_uint64*)&v) == 0)
logTraceError("operation failed on '", m_name, "': ", PHYSFS_getLastError());
} else {
if(m_cacheReadPos+8 >= m_cacheBuffer.size()) {
if(m_cacheReadPos+8 > m_cacheBuffer.size()) {
logTraceError("operation failed on '", m_name, "': reached file eof");
return 0;
}

5
src/otclient/core/mapview.cpp
View File

@@ -81,7 +81,7 @@ void MapView::draw(const Rect& rect)
g_painter->drawFilledRect(clearRect);
g_painter->setColor(Color::white);
// m_framebuffer->clear(Color::black);
// m_framebuffer->clear(Color::black);
}
auto it = m_cachedVisibleTiles.begin();
@@ -131,6 +131,8 @@ void MapView::draw(const Rect& rect)
drawOffset.y += (srcVisible.height() - srcSize.height()) / 2;
Rect srcRect = Rect(drawOffset, srcSize);
g_painter->setColor(Color::white);
g_painter->setCompositionMode(Painter::CompositionMode_Replace);
#if 0
// debug source area
g_painter->saveAndResetState();
@@ -144,6 +146,7 @@ void MapView::draw(const Rect& rect)
m_framebuffer->draw(rect, srcRect);
#endif
g_painter->resetCompositionMode();
g_painter->resetShaderProgram();
// this could happen if the player position is not known yet