shithub: choc

Info  •  Files  •  Log  •  Branches

Merge pull request #1470 from mikeday0/fixdrawtl

Fix transparent patch function mix-up

--- a/src/heretic/in_lude.c

+++ b/src/heretic/in_lude.c

@@ -895,10 +895,10 @@

             }

             else

             {

-                V_DrawTLPatch(40, ypos,

+                V_DrawAltTLPatch(40, ypos,

                               W_CacheLumpNum(patchFaceOkayBase + i,

                                              PU_CACHE));

-                V_DrawTLPatch(xpos, 18,

+                V_DrawAltTLPatch(xpos, 18,

                               W_CacheLumpNum(patchFaceDeadBase + i,

                                              PU_CACHE));

             }

--- a/src/heretic/sb_bar.c

+++ b/src/heretic/sb_bar.c

@@ -950,7 +950,7 @@

         if (CPlayer->readyArtifact > 0)

         {

             patch = DEH_String(patcharti[CPlayer->readyArtifact]);

-            V_DrawTLPatch(286, 170, W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));

+            V_DrawAltTLPatch(286, 170, W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));

             V_DrawPatch(286, 170, W_CacheLumpName(patch, PU_CACHE));

             DrSmallNumber(CPlayer->inventory[inv_ptr].count, 307, 192);

         }

@@ -960,7 +960,7 @@

         x = inv_ptr - curpos;

         for (i = 0; i < 7; i++)

         {

-            V_DrawTLPatch(50 + i * 31, 168,

+            V_DrawAltTLPatch(50 + i * 31, 168,

                           W_CacheLumpName(DEH_String("ARTIBOX"), PU_CACHE));

             if (CPlayer->inventorySlotNum > x + i

                 && CPlayer->inventory[x + i].type != arti_none)

--- a/src/v_video.c

+++ b/src/v_video.c

@@ -315,7 +315,7 @@

             while (count--)

             {

-                *dest = tinttable[((*dest) << 8) + *source++];

+                *dest = tinttable[*dest + ((*source++) << 8)];

                 dest += SCREENWIDTH;

             }

             column = (column_t *) ((byte *) column + column->length + 4);