Update of /cvsroot/wpdev/wolfpack/ai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14349/ai
Modified Files:
ai.cpp ai_humans.cpp
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)
Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ai_humans.cpp 12 Aug 2004 03:17:05 -0000 1.16
--- ai_humans.cpp 13 Aug 2004 08:55:27 -0000 1.17
***************
*** 120,124 ****
continue;
! if ( ( *it ) && ( *it )->getTag( "player" ).toInt() == pTalker->serial() )
stableitems.push_back( ( *it ) );
++it;
--- 120,124 ----
continue;
! if ( ( *it ) && ( uint )( *it )->getTag( "player" ).toInt() == pTalker->serial() )
stableitems.push_back( ( *it ) );
++it;
***************
*** 231,237 ****
{
case 0:
! m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), -1, 0, true ); break;
case 1:
! m_npc->talk( tr( "Death to all Evil!" ), -1, 0, true ); break;
}
--- 231,237 ----
{
case 0:
! m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), 0xFFFF, 0, true ); break;
case 1:
! m_npc->talk( tr( "Death to all Evil!" ), 0xFFFF, 0, true ); break;
}
***************
*** 381,387 ****
{
case 0:
! m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), -1, 0, true ); break;
case 1:
! m_npc->talk( tr( "Death to all Evil!" ), -1, 0, true ); break;
}
}
--- 381,387 ----
{
case 0:
! m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), 0xFFFF, 0, true ); break;
case 1:
! m_npc->talk( tr( "Death to all Evil!" ), 0xFFFF, 0, true ); break;
}
}
Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ai.cpp 10 Aug 2004 03:19:27 -0000 1.22
--- ai.cpp 13 Aug 2004 08:55:26 -0000 1.23
***************
*** 589,593 ****
}
if ( pTarget->dist( m_npc ) > 3 )
! m_npc->setAICheckTime( Server::instance()->time() + ( float ) m_npc->aiCheckInterval() * 0.0005f * MY_CLOCKS_PER_SEC );
}
else
--- 589,593 ----
}
if ( pTarget->dist( m_npc ) > 3 )
! m_npc->setAICheckTime( ( uint )( Server::instance()->time() + ( float ) m_npc->aiCheckInterval() * 0.0005f * MY_CLOCKS_PER_SEC ) );
}
else
|
