X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=84f6544515de235e82b753cda05af9eb15fb718f;hp=4137d8b012ef6d22793b06fe1ecf48fd4bf14c8a;hb=f0703eae1c66566c95d11bf44ff4560be416b971;hpb=42e251585e2584512ddf4049431e5e0faec3a860

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 4137d8b..84f6544 100644
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -80,7 +80,8 @@ implementation
 
 uses
   SysUtils, e_msg, e_input, e_graphics, e_log, g_window, g_net, g_console,
-  g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, wadreader;
+  g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic,
+  wadreader;
 
 var
   NetMEvent:      ENetEvent;
@@ -135,6 +136,7 @@ var
   InMsg: TMsg;
   SvAddr: ENetAddress;
   FromSL: Boolean;
+  UpdVer, MyVer: string;
 
   procedure ProcessLocal();
   begin
@@ -215,6 +217,10 @@ begin
   NetOut.Clear();
   NetOut.Write(Byte(NET_MMSG_GET));
 
+  // TODO: what should we identify the build with?
+  MyVer := GAME_VERSION;
+  NetOut.Write(MyVer);
+
   P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE));
   enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P);
   enet_host_flush(NetMHost);
@@ -254,6 +260,17 @@ begin
         end;
       end;
 
+      if InMsg.ReadCount < InMsg.CurSize then
+      begin
+        // new master, supports version reports
+        UpdVer := InMsg.ReadString();
+        if (UpdVer <> MyVer) then
+        begin
+          { TODO }
+          g_Console_Add('!!! UpdVer = `' + UpdVer + '`');
+        end;
+      end;
+
       Result := True;
       break;
     end;
@@ -707,7 +724,9 @@ begin
 
   qm := g_ProcessMessages(); // this updates kbd
 
-  if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) then
+  if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
+     e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or
+     e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then
   begin
     SL := nil;
     ST := nil;
@@ -719,7 +738,8 @@ begin
     Exit;
   end;
 
-  if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_JUMP) then
+  if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_JUMP) or
+     e_KeyPressed(JOY0_ACTIVATE) or e_KeyPressed(JOY1_ACTIVATE) or e_KeyPressed(JOY2_ACTIVATE) or e_KeyPressed(JOY3_ACTIVATE) then
   begin
     if not slFetched then
     begin
@@ -746,7 +766,8 @@ begin
 
   if SL = nil then Exit;
 
-  if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) then
+  if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+     e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK) then
   begin
     if not slReturnPressed then
     begin
@@ -773,7 +794,8 @@ begin
   else
     slReturnPressed := False;
 
-  if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) or e_KeyPressed(VK_DOWN) then
+  if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) or e_KeyPressed(VK_DOWN) or
+     e_KeyPressed(JOY0_DOWN) or e_KeyPressed(JOY1_DOWN) or e_KeyPressed(JOY2_DOWN) or e_KeyPressed(JOY3_DOWN) then
   begin
     if not slDirPressed then
     begin
@@ -783,7 +805,8 @@ begin
     end;
   end;
 
-  if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) then
+  if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) or
+     e_KeyPressed(JOY0_UP) or e_KeyPressed(JOY1_UP) or e_KeyPressed(JOY2_UP) or e_KeyPressed(JOY3_UP) then
   begin
     if not slDirPressed then
     begin
@@ -794,7 +817,8 @@ begin
     end;
   end;
 
-  if e_KeyPressed(IK_RIGHT) or e_KeyPressed(IK_KPRIGHT) or e_KeyPressed(VK_RIGHT) then
+  if e_KeyPressed(IK_RIGHT) or e_KeyPressed(IK_KPRIGHT) or e_KeyPressed(VK_RIGHT) or
+     e_KeyPressed(JOY0_RIGHT) or e_KeyPressed(JOY1_RIGHT) or e_KeyPressed(JOY2_RIGHT) or e_KeyPressed(JOY3_RIGHT) then
   begin
     if not slDirPressed then
     begin
@@ -804,7 +828,8 @@ begin
     end;
   end;
 
-  if e_KeyPressed(IK_LEFT) or e_KeyPressed(IK_KPLEFT) or e_KeyPressed(VK_LEFT) then
+  if e_KeyPressed(IK_LEFT) or e_KeyPressed(IK_KPLEFT) or e_KeyPressed(VK_LEFT) or
+     e_KeyPressed(JOY0_LEFT) or e_KeyPressed(JOY1_LEFT) or e_KeyPressed(JOY2_LEFT) or e_KeyPressed(JOY3_LEFT) then
   begin
     if not slDirPressed then
     begin
@@ -826,7 +851,12 @@ begin
      (not e_KeyPressed(VK_DOWN)) and
      (not e_KeyPressed(VK_UP)) and
      (not e_KeyPressed(VK_RIGHT)) and
-     (not e_KeyPressed(VK_LEFT)) then
+     (not e_KeyPressed(VK_LEFT)) and
+     (not e_KeyPressed(JOY0_UP)) and (not e_KeyPressed(JOY1_UP)) and (not e_KeyPressed(JOY2_UP)) and (not e_KeyPressed(JOY3_UP)) and
+     (not e_KeyPressed(JOY0_DOWN)) and (not e_KeyPressed(JOY1_DOWN)) and (not e_KeyPressed(JOY2_DOWN)) and (not e_KeyPressed(JOY3_DOWN)) and
+     (not e_KeyPressed(JOY0_LEFT)) and (not e_KeyPressed(JOY1_LEFT)) and (not e_KeyPressed(JOY2_LEFT)) and (not e_KeyPressed(JOY3_LEFT)) and
+     (not e_KeyPressed(JOY0_RIGHT)) and (not e_KeyPressed(JOY1_RIGHT)) and (not e_KeyPressed(JOY2_RIGHT)) and (not e_KeyPressed(JOY3_RIGHT))
+ then
     slDirPressed := False;
 end;