projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/sdl2'
[supertux.git]
/
src
/
video
/
texture_manager.cpp
diff --git
a/src/video/texture_manager.cpp
b/src/video/texture_manager.cpp
index
7e07d77
..
7be9a09
100644
(file)
--- a/
src/video/texture_manager.cpp
+++ b/
src/video/texture_manager.cpp
@@
-158,10
+158,10
@@
TextureManager::create_image_texture_raw(const std::string& filename, const Rect
throw std::runtime_error("SDL_CreateRGBSurfaceFrom() call failed");
}
throw std::runtime_error("SDL_CreateRGBSurfaceFrom() call failed");
}
- if (image->format->palette)
+
/*
if (image->format->palette)
{ // copy the image palette to subimage if present
{ // copy the image palette to subimage if present
- SDL_Set
Colors(subimage.get(), image->format->palette->colors, 0, image->format->palette->ncolors);
- }
+ SDL_Set
SurfacePalette(subimage.get(), image->format->palette->colors); //edited by giby
+ }
*/
return VideoSystem::new_texture(subimage.get());
}
return VideoSystem::new_texture(subimage.get());
}