diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 53f36f070b..3da199ef33 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+May 14, 2008
+- Fixed: FBarShader::GetColumn() passed incorrect information to the software
+ renderer for horizontal bars.
+
May 13, 2008 (Changes by Graf Zahl)
- Changed: For actors not being spawned on the floor P_FindFloorCeiling should
be used to prevent them from dropping through 3DMIDTEX textures.
@@ -13,7 +17,6 @@ May 13, 2008
FString::Format() so that I can fix all the problem printf strings that a
64-bit GCC compile finds.
->>>>>>> .r969
May 12, 2008 (Changes by Graf Zahl)
- Added Skulltag's PUFFGETSOWNER flag.
- Fixed: Parsing sector special bit masks must be done backwards so that later
diff --git a/src/g_shared/sbarinfo_display.cpp b/src/g_shared/sbarinfo_display.cpp
index 2244c5b587..ecf11f2d95 100644
--- a/src/g_shared/sbarinfo_display.cpp
+++ b/src/g_shared/sbarinfo_display.cpp
@@ -201,7 +201,7 @@ FBarShader::FBarShader(bool vertical, bool reverse) //make an alpha map
}
}
DummySpan[0].TopOffset = 0;
- DummySpan[0].Length = vertical ? 256 : 1;
+ DummySpan[0].Length = vertical ? 256 : 2;
DummySpan[1].TopOffset = 0;
DummySpan[1].Length = 0;
}
@@ -212,7 +212,7 @@ const BYTE *FBarShader::GetColumn(unsigned int column, const Span **spans_out)
{
*spans_out = DummySpan;
}
- return Pixels + (column & WidthMask) * 256;
+ return Pixels + ((column & WidthMask) << HeightBits);
}
const BYTE *FBarShader::GetPixels()
diff --git a/zdoom.vcproj b/zdoom.vcproj
index 790787339d..f5f92a7021 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -950,6 +940,16 @@
Outputs=""src/$(InputName).h""
/>
+
+
+
@@ -1544,16 +1544,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
@@ -1924,14 +1932,6 @@
Outputs="$(IntDir)\$(InputName).obj"
/>
-
-
-
+
+
+
@@ -2798,14 +2806,6 @@
AdditionalIncludeDirectories="src\win32;$(NoInherit)"
/>
-
-
-
@@ -3072,7 +3072,7 @@
/>
+
+
+
@@ -3711,6 +3721,16 @@
Outputs="$(InputDir)xlat_parser.c;$(InputDir)xlat_parser.h"
/>
+
+
+