fix last case of textSide

NQNStudios · Dec 3, 2024 · 270b2bb · 270b2bb
1 parent 3bd9154
commit 270b2bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/rsrc/schemas/dialog.xsd b/rsrc/schemas/dialog.xsd
@@ -63,7 +63,7 @@
 			<xs:enumeration value="led"/>
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="textSide">
+	<xs:simpleType name="labelPos">
 		<xs:restriction base="xs:token">
 			<xs:enumeration value="left"/>
 			<xs:enumeration value="right"/>
@@ -236,7 +236,7 @@
 				<xs:attributeGroup ref="rect-size"/>
 				<xs:attributeGroup ref="position"/>
 				<xs:attributeGroup ref="font"/>
-				<xs:attribute name="label-pos" default="right" type="textSide"/>
+				<xs:attribute name="label-pos" default="right" type="labelPos"/>
 				<xs:attribute name="wrap" default="false" type="bool"/>
 			</xs:extension>
 		</xs:simpleContent>

diff --git a/src/game/boe.text.cpp b/src/game/boe.text.cpp
@@ -343,11 +343,13 @@ void put_item_screen(eItemWinMode screen_num) {
 						place_item_graphic(i,item.graphic_num); 
 						place_item_button(3,i,ITEMBTN_INFO); // info button
 						if((stat_screen_mode == MODE_INVEN) &&
-							((is_town()) || (is_out()) || ((is_combat()) && (pc == univ.cur_pc)))) { // place give and drop and use
+							((is_town()) || (is_out()) || ((is_combat()) && (pc == univ.cur_pc))) && overall_mode != MODE_SHOPPING) { // place give and drop and use
+
 							place_item_button(1,i,ITEMBTN_GIVE);
 							place_item_button(2,i,ITEMBTN_DROP);
 							if(item.can_use() && (item.rechargeable ? item.charges > 0 : true)) // place use if can
 								place_item_button(0,i,ITEMBTN_USE);
+
 						}
 					}
 					if(stat_screen_mode != MODE_INVEN && stat_screen_mode != MODE_SHOP) {