a_dinosaur/tmx2gba
1
0
Fork 0
mirror of https://github.com/ScrelliCopter/tmx2gba.git synced 2025-02-21 03:29:25 +11:00
Code Issues Releases Activity

Added some more stuff to the gitignore.

Browse Source 
Added some casts and fixed up the type param of a call to std::max.
This commit is contained in:
a dinosaur
2015-09-26 16:04:45 +10:00
parent 1de1461aec
commit 0d30afd74d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.gitignore vendored
View File

@@ -30,6 +30,11 @@
# VS rubbish.
Debug/
Release/
tmx2gba.opensdf
tmx2gba.sdf
tmx2gba.v12.suo
*.opensdf
*.sdf
*.v12.suo
*.vcxproj.user
# Some files I used for testing.
*.tmx
*.raw

2
src/tmx2gba.cpp
View File

@@ -278,7 +278,7 @@ int main ( int argc, char** argv )
vucCharDat.reserve ( info.width * info.height );
for ( size_t i = 0; i < size_t(info.width * info.height * 2); ++i )
{
uint16_t usTile = std::max<int> ( (*pRead++) + iOffset, 0 );
uint16_t usTile = std::max<uint16_t> ( (*pRead++) + (uint16_t)iOffset, 0 );
bool bFlipH = ( 0x8000 & *pRead ) ? true : false;
bool bFlipV = ( 0x4000 & *pRead++ ) ? true : false;