(SBARINFO patch)

- Fixed: DrawBar would not show.
- Fixed: IsSelected took string constants instead of identifiers.

SVN r1176 (trunk)

docs/rh-log.txt

@@ -1,3 +1,7 @@
+August 18, 2008 (SBARINFO patch)
+- Fixed: DrawBar would not show.
+- Fixed: IsSelected took string constants instead of identifiers.
+
 August 16, 2008 (Changes by Graf Zahl)
 - Put more floor/ceiling properties in sector_t into a substructure and
   added wrapper functions.

src/g_shared/sbarinfo_display.cpp

@@ -901,30 +901,27 @@ void DSBarInfo::doCommands(SBarInfoBlock &block, int xOffset, int yOffset, int a
 				int cx, cy, cw, ch, cr, cb;
 
 				// These still need to be caclulated for the clear call.
-				if(bg == NULL)
+				if(!block.fullScreenOffsets)
 				{
-					if(!block.fullScreenOffsets)
+					// Calc real screen coordinates for bar
+					x = cmd.x + ST_X + xOffset;
+					y = cmd.y + ST_Y + yOffset;
+					w = fg->GetScaledWidth();
+					h = fg->GetScaledHeight();
+					if (Scaled)
 					{
-						// Calc real screen coordinates for bar
+						screen->VirtualToRealCoordsInt(x, y, w, h, 320, 200, true);
-						x = cmd.x + ST_X + xOffset;
-						y = cmd.y + ST_Y + yOffset;
-						w = fg->GetScaledWidth();
-						h = fg->GetScaledHeight();
-						if (Scaled)
-						{
-							screen->VirtualToRealCoordsInt(x, y, w, h, 320, 200, true);
-						}
-					}
-					else
-					{
-						x = cmd.x + xOffset;
-						y = cmd.y + yOffset;
-						w = fg->GetScaledWidth();
-						h = fg->GetScaledHeight();
-						if(vid_fps && x < 0 && y >= 0)
-							y += 10;
 					}
 				}
+				else
+				{
+					x = cmd.x + xOffset;
+					y = cmd.y + yOffset;
+					w = fg->GetScaledWidth();
+					h = fg->GetScaledHeight();
+					if(vid_fps && x < 0 && y >= 0)
+						y += 10;
+				}
 
 				if(cmd.special3 != 0)
 				{

src/g_shared/sbarinfo_parser.cpp

@@ -1147,16 +1147,18 @@ void SBarInfo::ParseSBarInfoBlock(FScanner &sc, SBarInfoBlock &block)
 				this->ParseSBarInfoBlock(sc, cmd.subBlock);
 				break;
 			case SBARINFO_ISSELECTED:
+				//Using StringConst instead of Identifieres is deperecated!
 				if(sc.CheckToken(TK_Identifier))
 				{
 					if(sc.Compare("not"))
 					{
 						cmd.flags |= SBARINFOEVENT_NOT;
+						if(!sc.CheckToken(TK_StringConst))
+							sc.MustGetToken(TK_Identifier);
 					}
-					else
-						sc.ScriptError("Expected 'not' got '%s' instead.", sc.String);
 				}
-				sc.MustGetToken(TK_StringConst);
+				else
+					sc.MustGetToken(TK_StringConst);
 				for(int i = 0;i < 2;i++)
 				{
 					cmd.setString(sc, sc.String, i);
@@ -1166,7 +1168,10 @@ void SBarInfo::ParseSBarInfoBlock(FScanner &sc, SBarInfoBlock &block)
 						sc.ScriptError("'%s' is not a type of weapon.", sc.String);
 					}
 					if(sc.CheckToken(','))
-						sc.MustGetToken(TK_StringConst);
+					{
+						if(!sc.CheckToken(TK_StringConst))
+							sc.MustGetToken(TK_Identifier);
+					}
 					else
 						break;
 				}