Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RDY] Restricts minimum texture size to fix crash during division by zero #22638

Merged
merged 2 commits into from
Dec 21, 2017
Merged

[RDY] Restricts minimum texture size to fix crash during division by zero #22638

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329dcc4
Restricts minimum texture size to fix crash during division by zero
ZhilkinSerg Dec 18, 2017
3e80249
Merge branch 'master' into sdl-fix-atlas-tile-split
ZhilkinSerg Dec 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/cata_tiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,19 @@ void tileset_loader::load_tileset( std::string img_path )
info.max_texture_height = sprite_height * 20 + 1;
#endif

const int min_tile_xcount = 128;
const int min_tile_ycount = min_tile_xcount * 2;

if( info.max_texture_width == 0 ){
info.max_texture_width = sprite_width * min_tile_xcount;
DebugLog( D_INFO, DC_ALL ) << "SDL_RendererInfo max_texture_width was set to 0. Changing it to " << info.max_texture_width;
}

if( info.max_texture_height == 0 ){
info.max_texture_height = sprite_height * min_tile_ycount;
DebugLog( D_INFO, DC_ALL ) << "SDL_RendererInfo max_texture_height was set to 0. Changing it to " << info.max_texture_height;
}

// Number of tiles in each dimension that fits into a (maximal) SDL texture.
// If the tile atlas contains more than that, we have to split it.
const int max_tile_xcount = info.max_texture_width / sprite_width;
Expand Down