X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=66c1edc5688a048a6506442636133df48414fdf6;hb=9c2247dcfd066a8ffed3137433a909e862a65640;hp=075fe6b54891997704ceba1a74ad5df6ab6457e7;hpb=2a94357f8d72648a4f1280543554c557beadb81a;p=d2df-sdl.git

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 075fe6b..66c1edc 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -1534,8 +1534,6 @@ begin
         if g_Game_IsNet and (gPlayer1 <> nil) then gPlayer1.PressKey(KEY_CHAT, 10000);
       end;
       // process weapon switch queue
-      //if gPlayer1 <> nil then gPlayer1.RealizeCurrentWeapon();
-      //if gPlayer2 <> nil then gPlayer2.RealizeCurrentWeapon();
     end; // if server
 
   // Íàáëþäàòåëü
@@ -2514,6 +2512,7 @@ begin
 
   glTranslatef(-x, -y, 0);
 
+  g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
   g_Map_DrawPanels(PANEL_BACK);
   g_Map_DrawPanels(PANEL_STEP);
   g_Items_Draw();
@@ -2535,6 +2534,7 @@ begin
     g_Monsters_DrawHealth();
     g_Player_DrawHealth();
   end;
+  g_Map_ResetPVP();
 
   glPopMatrix();
 end;
@@ -2628,6 +2628,8 @@ begin
 
   glTranslatef(a, b+p.IncCam, 0);
 
+  g_Map_BuildPVP(sX, sY, sX+sWidth-1, sY+sHeight-1);
+
   g_Map_DrawPanels(PANEL_BACK);
   g_Map_DrawPanels(PANEL_STEP);
   g_Items_Draw();
@@ -2673,6 +2675,7 @@ begin
   }
 
   glPopMatrix();
+  g_Map_ResetPVP();
 
   p.DrawPain();
   p.DrawPickup();
@@ -4878,6 +4881,9 @@ begin
       if cmd = 'superchaingun' then begin plr.GiveItem(ITEM_WEAPON_SUPERPULEMET); g_Console_Add('player got a superchaingun'); continue; end;
       if cmd = 'superchaingunzz' then begin plr.GiveItem(ITEM_WEAPON_SUPERPULEMET); plr.GiveItem(ITEM_AMMO_BULLETS_BOX); g_Console_Add('player got a superchaingun'); continue; end;
 
+      if (cmd = 'flamer') or (cmd = 'flamethrower') or (cmd = 'ft') then begin plr.GiveItem(ITEM_WEAPON_FLAMETHROWER); g_Console_Add('player got a flame thrower'); continue; end;
+      if (cmd = 'flamerzz') or (cmd = 'flamethrowerzz') or (cmd = 'ftzz') then begin plr.GiveItem(ITEM_WEAPON_FLAMETHROWER); plr.GiveItem(ITEM_AMMO_FUELCAN); g_Console_Add('player got a flame thrower'); continue; end;
+
       if cmd = 'chainsaw' then begin plr.GiveItem(ITEM_WEAPON_SAW); g_Console_Add('player got a chainsaw'); continue; end;
 
       if cmd = 'ammo' then
@@ -4886,6 +4892,7 @@ begin
         plr.GiveItem(ITEM_AMMO_BULLETS_BOX);
         plr.GiveItem(ITEM_AMMO_CELL_BIG);
         plr.GiveItem(ITEM_AMMO_ROCKET_BOX);
+        plr.GiveItem(ITEM_AMMO_FUELCAN);
         g_Console_Add('player got some ammo');
         continue;
       end;
@@ -4902,6 +4909,8 @@ begin
       if cmd = 'rocket' then begin plr.GiveItem(ITEM_AMMO_ROCKET); g_Console_Add('player got a rocket'); continue; end;
       if cmd = 'rocketbox' then begin plr.GiveItem(ITEM_AMMO_ROCKET_BOX); g_Console_Add('player got some rockets'); continue; end;
 
+      if (cmd = 'fuel') or (cmd = 'fuelcan') then begin plr.GiveItem(ITEM_AMMO_FUELCAN); g_Console_Add('player got fuel canister'); continue; end;
+
       if cmd = 'weapons' then
       begin
         plr.GiveItem(ITEM_WEAPON_SHOTGUN1);
@@ -6484,7 +6493,12 @@ begin
 // Debug mode:
   s := Find_Param_Value(pars, '--debug');
   if (s <> '') then
+  begin
     g_Game_SetDebugMode();
+    s := Find_Param_Value(pars, '--netdump');
+    if (s <> '') then
+      NetDump := True;
+  end;
 
 // Connect when game loads
   ip := Find_Param_Value(pars, '-connect');