dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
This commit is contained in:
Jonathan G Rennison
2017-03-19 12:27:24 +00:00
parent ac69b746ab fae4ac1a5d
commit b3fd11efd2
75 changed files with 184 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blitter/32bpp_anim.cpp
View File

@@ -441,11 +441,10 @@ void Blitter_32bppAnim::CopyToBuffer(const void *video, void *dst, int width, in
assert(video >= _screen.dst_ptr && video <= (uint32 *)_screen.dst_ptr + _screen.width + _screen.height * _screen.pitch);
uint32 *udst = (uint32 *)dst;
const uint32 *src = (const uint32 *)video;
const uint16 *anim_line;
if (this->anim_buf == NULL) return;
anim_line = this->ScreenToAnimOffset((const uint32 *)video) + this->anim_buf;
const uint16 *anim_line = this->ScreenToAnimOffset((const uint32 *)video) + this->anim_buf;
for (; height > 0; height--) {
memcpy(udst, src, width * sizeof(uint32));