diff -N -u -r freelords-0.3.7-old/src/ai_smart.h freelords-0.3.7/src/ai_smart.h --- freelords-0.3.7-old/src/ai_smart.h 2006-05-16 22:38:32.461522747 +0200 +++ freelords-0.3.7/src/ai_smart.h 2006-05-16 22:42:53.180077999 +0200 @@ -106,7 +106,7 @@ Threat *getBiggestDangerTo(City *city, Threatlist *threats); // examine cities to see if we need to change production - void AI_Smart::examineCities(); + void examineCities(); }; #endif // AI_SMART_H diff -N -u -r freelords-0.3.7-old/src/OptionsDialog.cpp freelords-0.3.7/src/OptionsDialog.cpp --- freelords-0.3.7-old/src/OptionsDialog.cpp 2006-05-16 22:38:32.921421416 +0200 +++ freelords-0.3.7/src/OptionsDialog.cpp 2006-05-16 22:46:17.083151544 +0200 @@ -245,7 +245,7 @@ d_smooth_scrolling->Hide(); d_show_next_player->Hide(); - unsigned int mode = (unsigned int)item->GetUserData(); + unsigned long mode = (unsigned long)item->GetUserData(); switch(mode) { diff -N -u -r freelords-0.3.7-old/src/path.h freelords-0.3.7/src/path.h --- freelords-0.3.7-old/src/path.h 2006-05-16 22:38:32.465521866 +0200 +++ freelords-0.3.7/src/path.h 2006-05-16 22:40:28.655921355 +0200 @@ -60,7 +60,7 @@ /* This function is used to verify if the stack can move on the Tile * of the given destination point */ - bool Path::canMoveThere(Stack* s, PG_Point* dest); + bool canMoveThere(Stack* s, PG_Point* dest); /** Validates an existing path. * diff -N -u -r freelords-0.3.7-old/src/scroller.h freelords-0.3.7/src/scroller.h --- freelords-0.3.7-old/src/scroller.h 2006-05-16 22:38:32.937417892 +0200 +++ freelords-0.3.7/src/scroller.h 2006-05-16 22:44:24.244013663 +0200 @@ -39,7 +39,7 @@ void eventMouseLeave(); //! Begin the scroll - Uint32 Scroller::eventTimer (ID id, Uint32 interval); + Uint32 eventTimer (ID id, Uint32 interval); Uint32 d_timer; SmallMap * d_smap; diff -N -u -r freelords-0.3.7-old/src/tooltip.h freelords-0.3.7/src/tooltip.h --- freelords-0.3.7-old/src/tooltip.h 2006-05-16 22:38:32.505513055 +0200 +++ freelords-0.3.7/src/tooltip.h 2006-05-16 22:44:49.426465153 +0200 @@ -55,7 +55,7 @@ bool eventMouseMotion(const SDL_MouseMotionEvent* event); bool eventMouseButtonDown(const SDL_MouseButtonEvent* event); //! Shows the tooltip after TOOLTIP_WAIT milliseconds - Uint32 ToolTip::eventTimer (ID id, Uint32 interval); + Uint32 eventTimer (ID id, Uint32 interval); Uint32 d_timer; int d_movecounter;