Little fixes

rsrc/dialogs/pc-info.xml

@@ -69,7 +69,7 @@
 	<text name='hp' top='69' left='325' width='155' height='18'/>
 	<text top='89' left='314' width='75' height='19'>Spell Pts.</text>
 	<text name='sp' top='108' left='325' width='155' height='18'/>
-	<button name='alch' type='large' top='339' left='176'>Alchemy</button>
+	<button name='alchemy' type='large' top='339' left='176'>Alchemy</button>
 	<text name='weight' framed='true' top='285' left='11' width='387' height='17'/>
 	<text size='large' top='29' left='382' width='62' height='16'>Skill Pts.:</text>
 	<text name='skp' size='large' top='29' left='445' width='32' height='16'/>

rsrc/schemas/dialog.xsd

@@ -156,7 +156,7 @@
     <xs:complexType>
       <xs:simpleContent>
         <xs:extension base="xs:string">
-          <xs:attribute name="name" type="xs:ID"/>
+          <xs:attribute name="name" type="xs:token"/>
           <xs:attribute name="type" default="text">
             <xs:simpleType>
               <xs:restriction base="xs:token">
@@ -180,7 +180,7 @@
           <xs:complexType/>
         </xs:element>
       </xs:sequence>
-      <xs:attribute name="name" type="xs:ID"/>
+      <xs:attribute name="name" type="xs:token"/>
       <xs:attribute name="framed" default="false" type="bool"/>
       <xs:attributeGroup ref="font"/>
       <xs:attributeGroup ref="keys"/>
@@ -191,7 +191,7 @@
   </xs:element>
   <xs:element name="pict">
     <xs:complexType>
-      <xs:attribute name="name" type="xs:ID"/>
+      <xs:attribute name="name" type="xs:token"/>
       <xs:attribute name="type" use="required" type="picttype"/>
       <xs:attribute name="custom" default="false" type="bool"/>
       <xs:attribute name="framed" default="true" type="bool"/>
@@ -218,7 +218,7 @@
           <xs:complexType/>
         </xs:element>
       </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:ID"/>
+      <xs:attribute name="name" use="required" type="xs:token"/>
       <xs:attribute name="type" use="required" type="btntype"/>
       <xs:attribute name="wrap" default="false" type="bool"/>
       <xs:attributeGroup ref="keys"/>
@@ -230,7 +230,7 @@
     <xs:complexType>
       <xs:simpleContent>
         <xs:extension base="xs:string">
-          <xs:attribute name="name" use="required" type="xs:ID"/>
+          <xs:attribute name="name" use="required" type="xs:token"/>
           <xs:attribute name="state" default="off">
             <xs:simpleType>
               <xs:restriction base="xs:token">
@@ -252,7 +252,7 @@
       <xs:sequence>
         <xs:element maxOccurs="unbounded" ref="led"/>
       </xs:sequence>
-      <xs:attribute name="name" type="xs:ID"/>
+      <xs:attribute name="name" type="xs:token"/>
       <xs:attribute name="fromlist" default="none" type="xs:string"/>
     </xs:complexType>
   </xs:element>
@@ -266,7 +266,7 @@
         <xs:element ref="led"/>
         <xs:element ref="group"/>
       </xs:choice>
-      <xs:attribute name="name" type="xs:ID"/>
+      <xs:attribute name="name" type="xs:token"/>
       <xs:attribute name="pages" type="xs:integer"/>
     </xs:complexType>
   </xs:element>
@@ -291,11 +291,15 @@
       </xs:attribute>
       <xs:attribute name="debug" default="false" type="bool"/>
       <xs:attribute name="fore" default="black"/>
-      <xs:attribute name="defbtn" type="xs:IDREF"/>
+      <xs:attribute name="defbtn" type="xs:token"/>
     </xs:complexType>
     <xs:unique name="FieldTabOrder">
       <xs:selector xpath="*" />
       <xs:field xpath="@tab-order" />
     </xs:unique>
+    <xs:unique name='uniqueID'>
+      <xs:selector xpath='*'/>
+      <xs:field xpath='@name'/>
+    </xs:unique>
   </xs:element>
 </xs:schema>

src/classes/regtown.cpp

@@ -21,6 +21,7 @@
 void cTinyTown::append(legacy::tiny_tr_type& old, int town_num){
 	int i,j;
 	cField the_field;
+    (void)town_num;
 	the_field.type = SPECIAL_SPOT;
 	// Collect a list of unused special nodes, to be used for fixing specials that could be triggered in a boat.
 	std::vector<int> unused_special_slots;
@@ -88,6 +89,7 @@ void cTinyTown::append(legacy::tiny_tr_type& old, int town_num){
 void cMedTown::append(legacy::ave_tr_type& old, int town_num){
 	int i,j;
 	cField the_field;
+    (void)town_num;         // Silencing Warnings until towns have numbers
 	the_field.type = SPECIAL_SPOT;
 	// Collect a list of unused special nodes, to be used for fixing specials that could be triggered in a boat.
 	std::vector<int> unused_special_slots;
@@ -152,8 +154,9 @@ void cMedTown::append(legacy::ave_tr_type& old, int town_num){
 	}
 }
 
-void cBigTown::append(legacy::big_tr_type& old, int town_numo){
+void cBigTown::append(legacy::big_tr_type& old, int town_num){
 	int i,j;
+    (void)town_num;
 	cField the_field;
 	the_field.type = SPECIAL_SPOT;
 	// Collect a list of unused special nodes, to be used for fixing specials that could be triggered in a boat.

src/dialogxml/control.cpp

@@ -241,9 +241,9 @@ static unsigned char removeShift(unsigned char c){
 	return afterUnShift[c - ' '];
 }
 
-void cControl::setTextToKey(){
+void cControl::setTextToKey() {
 	if(key.spec); // TODO: Handle this case
-	else{
+	else {
 		unsigned char c = key.c;
 		if(key.mod - mod_shift != key.mod) c = applyShift(c);
 		else c = removeShift(c);