Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6634
Modified Files:
basedef.cpp npc.cpp
Log Message:
Warning fixes, fear my newbie fixing skills!
Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** basedef.cpp 18 Sep 2004 01:32:12 -0000 1.20
--- basedef.cpp 19 Sep 2004 23:41:00 -0000 1.21
***************
*** 45,49 ****
}
value = hex2dec(value); // Convert hexadecimal numbers accordingly
!
bool ok;
unsigned int intvalue = value.toInt(&ok);
--- 45,49 ----
}
value = hex2dec(value); // Convert hexadecimal numbers accordingly
!
bool ok;
unsigned int intvalue = value.toInt(&ok);
***************
*** 54,58 ****
intproperties.insert(name.lower(), intvalue, true);
! }
} else if (node->name() == "strproperty") {
QString name = node->getAttribute("name");
--- 54,58 ----
intproperties.insert(name.lower(), intvalue, true);
! }
} else if (node->name() == "strproperty") {
QString name = node->getAttribute("name");
***************
*** 61,65 ****
if (value.isNull()) {
value = node->text();
! }
properties.insert(name.lower(), value, true);
}
--- 61,65 ----
if (value.isNull()) {
value = node->text();
! }
properties.insert(name.lower(), value, true);
}
***************
*** 237,241 ****
QDomNode parent = document.namedItem("bodyinfo");
if (parent.isElement()) {
! for (int i = 0; i < parent.childNodes().count(); ++i) {
QDomElement element = parent.childNodes().item(i).toElement();
--- 237,241 ----
QDomNode parent = document.namedItem("bodyinfo");
if (parent.isElement()) {
! for (unsigned int i = 0; i < parent.childNodes().count(); ++i) {
QDomElement element = parent.childNodes().item(i).toElement();
***************
*** 243,247 ****
QString id = hex2dec(element.attribute("id"));
bool ok = false;
!
stBodyInfo bodyinfo;
--- 243,247 ----
QString id = hex2dec(element.attribute("id"));
bool ok = false;
!
stBodyInfo bodyinfo;
***************
*** 423,427 ****
applyDefinition( element );
}
! else
{
cBaseDef::processNode(node);
--- 423,427 ----
applyDefinition( element );
}
! else
{
cBaseDef::processNode(node);
Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** npc.cpp 17 Sep 2004 23:28:16 -0000 1.115
--- npc.cpp 19 Sep 2004 23:41:00 -0000 1.116
***************
*** 184,188 ****
void cNPC::save()
! {
if ( changed_ )
{
--- 184,188 ----
void cNPC::save()
! {
if ( changed_ )
{
***************
*** 206,210 ****
saveFields;
}
!
cBaseChar::save();
}
--- 206,210 ----
saveFields;
}
!
cBaseChar::save();
}
***************
*** 945,949 ****
Coord_cl cNPC::pathDestination( void ) const
{
!
if ( path_.empty() )
return Coord_cl( 0xFFFF, 0xFFFF, (SI08) 0xFF, 0 );
--- 945,949 ----
Coord_cl cNPC::pathDestination( void ) const
{
!
if ( path_.empty() )
return Coord_cl( 0xFFFF, 0xFFFF, (SI08) 0xFF, 0 );
***************
*** 1463,1465 ****
unsigned int cNPC::maxWeight() {
return 0;
! }
\ No newline at end of file
--- 1463,1465 ----
unsigned int cNPC::maxWeight() {
return 0;
! }
|
