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

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2017-04-01 01:14:28 +01:00
parent 83091f55da 86d1a00ba6
commit 8317eac918
81 changed files with 473 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blitter/8bpp_simple.cpp
View File

@@ -48,7 +48,7 @@ void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoom
break;
case BM_BLACK_REMAP:
colour = 0;
if (*src != 0) *dst = 0;
break;
default: