Fixed VS compilation (mostly by including winsock2.h before libcurl).

Also replaced binary numbers (non-standard) with hex numbers, and a few
minor cosmetic changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/hilnius@13367 178a84e3-b1eb-0310-8ba1-8eac791a3b58

src/network/protocols/controller_events_protocol.cpp

@@ -88,13 +88,13 @@ void ControllerEventsProtocol::notifyEvent(Event* event)
         PlayerAction action  = (PlayerAction)(ns.gui8(4));
         int action_value = ns.gui32(5);
 
-        KartControl* controls = m_controllers[controller_index].first->getControls();
-        controls->m_brake       = serialized_1 & 0b01000000;
-        controls->m_nitro       = serialized_1 & 0b00100000;
-        controls->m_rescue      = serialized_1 & 0b00010000;
-        controls->m_fire        = serialized_1 & 0b00001000;
-        controls->m_look_back   = serialized_1 & 0b00000100;
-        controls->m_skid        = KartControl::SkidControl(serialized_1 & 0b00000011);
+        KartControl* controls   = m_controllers[controller_index].first->getControls();
+        controls->m_brake       = (serialized_1 & 0x40)!=0;
+        controls->m_nitro       = (serialized_1 & 0x20)!=0;
+        controls->m_rescue      = (serialized_1 & 0x10)!=0;
+        controls->m_fire        = (serialized_1 & 0x08)!=0;
+        controls->m_look_back   = (serialized_1 & 0x04)!=0;
+        controls->m_skid        = KartControl::SkidControl(serialized_1 & 0x03);
 
         m_controllers[controller_index].first->action(action, action_value);
         ns.removeFront(9);

src/online/current_user.cpp

@@ -19,13 +19,14 @@
 
 #include "online/current_user.hpp"
 
+#include "config/user_config.hpp"
+#include "online/servers_manager.hpp"
+#include "utils/log.hpp"
+#include "utils/translation.hpp"
+
 #include <sstream>
 #include <stdlib.h>
 #include <assert.h>
-#include "config/user_config.hpp"
-#include "utils/translation.hpp"
-#include "utils/log.hpp"
-#include "online/servers_manager.hpp"
 
 namespace Online{
     static Synchronised<CurrentUser*> user_singleton(NULL);

src/online/current_user.hpp

@@ -19,13 +19,14 @@
 #ifndef HEADER_CURRENT_ONLINE_USER_HPP
 #define HEADER_CURRENT_ONLINE_USER_HPP
 
-#include "online/user.hpp"
-#include <string>
-#include <irrString.h>
-#include "utils/types.hpp"
-#include "online/server.hpp"
 #include "http_manager.hpp"
+#include "online/server.hpp"
+#include "online/user.hpp"
+#include "utils/types.hpp"
 
+#include <irrString.h>
+
+#include <string>
 
 namespace Online{
 

src/online/http_manager.hpp

@@ -19,20 +19,22 @@
 #ifndef HTTP_MANAGER_HPP
 #define HTTP_MANAGER_HPP
 
-#include <string>
-#include <curl/curl.h>
-#include <irrString.h>
-#include <queue>
-#include <pthread.h>
+#include "io/xml_node.hpp"
+#include "online/request.hpp"
+#include "utils/string_utils.hpp"
+#include "utils/synchronised.hpp"
 
+#include <irrString.h>
+
+#include <string>
 #ifdef WIN32
 #  include <winsock2.h>
 #endif
 
-#include "io/xml_node.hpp"
-#include "utils/string_utils.hpp"
-#include "utils/synchronised.hpp"
-#include "online/request.hpp"
+#include <curl/curl.h>
+#include <queue>
+#include <pthread.h>
+
 
 namespace Online{
 

src/online/request.cpp

@@ -16,10 +16,15 @@
 
 #include "online/request.hpp"
 
+#include "online/http_manager.hpp"
+#include "utils/translation.hpp"
+
+#ifdef WIN32
+#  include <winsock2.h>
+#endif
+
 #include <curl/curl.h>
 #include <assert.h>
-#include <online/http_manager.hpp>
-#include <utils/translation.hpp>
 
 
 namespace Online{

src/online/servers_manager.cpp

@@ -104,7 +104,7 @@ namespace Online{
             {
                 addServer(new Server(*servers_xml->getNode(i)));
             }
-            m_last_load_time = Time::getRealTime();
+            m_last_load_time = (float)Time::getRealTime();
         }
         m_info_message = input->getInfo();
         //FIXME error message