Merge https://github.com/coelckers/gzdoom

# Conflicts: # src/r_things.cpp # src/v_draw.cpp
2017-02-05 00:08:01 -05:00 · 2017-02-05 00:08:01 -05:00 · 59f32d497d
commit 59f32d497d
parent 4172d70d95 5cfac78116
45 changed files with 703 additions and 293 deletions
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@ -2934,8 +2934,8 @@ static void DrawMarker (FTexture *tex, double x, double y, int yadjust,
 		DTA_ClipLeft, f_x,
 		DTA_ClipRight, f_x + f_w,
 		DTA_FlipX, flip,
-		DTA_Translation, TranslationToTable(translation),
-		DTA_AlphaF, alpha,
+		DTA_TranslationIndex, translation,
+		DTA_Alpha, alpha,
 		DTA_FillColor, fillcolor,
 		DTA_RenderStyle, DWORD(renderstyle),
 		TAG_DONE);