diff --git a/source/lib/res/tex.cpp b/source/lib/res/tex.cpp index 687426d039..9a6e320789 100755 --- a/source/lib/res/tex.cpp +++ b/source/lib/res/tex.cpp @@ -43,7 +43,7 @@ #define WINAPIV __cdecl #ifndef NO_PNG -#include + #include #pragma comment(lib, "libpng10.lib") #endif diff --git a/source/main.cpp b/source/main.cpp index 15f3d1d4a0..6b73a12bc4 100755 --- a/source/main.cpp +++ b/source/main.cpp @@ -481,7 +481,7 @@ int main(int argc, char* argv[]) #endif - font = font_load("fonts/verdana18.fnt"); + font = font_load("fonts/verdana.fnt"); // set renderer options from command line options - NOVBO must be set before opening the renderer g_Renderer.SetOption(CRenderer::OPT_NOVBO,g_NoGLVBO); diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp index 3ff7a609a3..8d4c88c71d 100755 --- a/source/simulation/Entity.cpp +++ b/source/simulation/Entity.cpp @@ -239,7 +239,10 @@ void CEntity::update( float timestep ) m_orderQueue.pop_front(); m_orderQueue.push_front( pathfind_solution ); if( m_actor->m_Model->GetAnimation() != m_actor->m_Object->m_WalkAnim ) + { m_actor->m_Model->SetAnimation( m_actor->m_Object->m_WalkAnim ); + m_actor->m_Model->Update( ( rand() * 1000.0f ) / 1000.0f ); + } break; } case CEntityOrder::ORDER_PATROL: