X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_items.pas;h=c7565417c799ce2952c103a6c881e3cc53506d0a;hb=254041134b399e948e554ae99171174a7087ae40;hp=dffeb96096c08d34d753150f155a2f86cfb2e057;hpb=b7ff38d281991866c467f65974df53b305711281;p=d2df-sdl.git diff --git a/src/game/g_items.pas b/src/game/g_items.pas index dffeb96..c756541 100644 --- a/src/game/g_items.pas +++ b/src/game/g_items.pas @@ -34,7 +34,7 @@ Type Respawnable: Boolean; InitX, InitY: Integer; RespawnTime: Word; - Live: Boolean; + alive: Boolean; Fall: Boolean; QuietRespawn: Boolean; SpawnTrigger: Integer; @@ -342,7 +342,7 @@ begin it.Animation.Free(); it.Animation := nil; end; - it.Live := False; + it.alive := False; it.SpawnTrigger := -1; it.ItemType := ITEM_NONE; freeIds.release(LongWord(idx)); @@ -365,7 +365,7 @@ begin it.arrIdx := i; it.ItemType := ITEM_NONE; it.Animation := nil; - it.Live := false; + it.alive := false; it.SpawnTrigger := -1; it.Respawnable := false; //if not freeIds.hasFree[LongWord(i)] then raise Exception.Create('internal error in item idx manager'); @@ -456,7 +456,7 @@ begin it.InitY := Y; it.RespawnTime := 0; it.Fall := Fall; - it.Live := True; + it.alive := True; it.QuietRespawn := False; g_Obj_Init(@it.Obj); @@ -516,7 +516,7 @@ begin begin nxt := False; - if Live then + if alive then begin if Fall then begin @@ -552,7 +552,7 @@ begin Inc(j); if j > High(gPlayers) then j := 0; - if (gPlayers[j] <> nil) and gPlayers[j].Live and g_Obj_Collide(@gPlayers[j].Obj, @Obj) then + if (gPlayers[j] <> nil) and gPlayers[j].alive and g_Obj_Collide(@gPlayers[j].Obj, @Obj) then begin if g_Game_IsClient then continue; @@ -586,7 +586,7 @@ begin if Respawnable and g_Game_IsServer then begin DecMin(RespawnTime, 0); - if (RespawnTime = 0) and (not Live) then + if (RespawnTime = 0) and (not alive) then begin if not QuietRespawn then g_Sound_PlayExAt('SOUND_ITEM_RESPAWNITEM', InitX, InitY); @@ -605,7 +605,7 @@ begin Obj.Accel.Y := 0; positionChanged(); // this updates spatial accelerators - Live := true; + alive := true; if g_Game_IsNet then MH_SEND_ItemSpawn(QuietRespawn, i); QuietRespawn := false; @@ -626,11 +626,11 @@ begin for i := 0 to High(ggItems) do begin - if not ggItems[i].Live then continue; + if not ggItems[i].alive then continue; with ggItems[i] do begin - if g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then + if (g_dbg_scale <> 1.0) or g_Collide(Obj.X, Obj.Y, Obj.Rect.Width, Obj.Rect.Height, sX, sY, sWidth, sHeight) then begin if (Animation = nil) then begin @@ -657,7 +657,7 @@ end; procedure g_Items_Pick (ID: DWORD); begin - ggItems[ID].Live := false; + ggItems[ID].alive := false; ggItems[ID].RespawnTime := ITEM_RESPAWNTIME; end; @@ -716,7 +716,7 @@ begin // Âðåìÿ äî ðåñïàóíà Mem.WriteWord(ggItems[i].RespawnTime); // Ñóùåñòâóåò ëè ýòîò ïðåäìåò - Mem.WriteBoolean(ggItems[i].Live); + Mem.WriteBoolean(ggItems[i].alive); // Ìîæåò ëè îí ïàäàòü Mem.WriteBoolean(ggItems[i].Fall); // Èíäåêñ òðèããåðà, ñîçäàâøåãî ïðåäìåò @@ -760,7 +760,7 @@ begin // Âðåìÿ äî ðåñïàóíà Mem.ReadWord(ggItems[i].RespawnTime); // Ñóùåñòâóåò ëè ýòîò ïðåäìåò - Mem.ReadBoolean(ggItems[i].Live); + Mem.ReadBoolean(ggItems[i].alive); // Ìîæåò ëè îí ïàäàòü Mem.ReadBoolean(ggItems[i].Fall); // Èíäåêñ òðèããåðà, ñîçäàâøåãî ïðåäìåò @@ -804,7 +804,7 @@ begin begin for idx := High(ggItems) downto 0 do begin - if ggItems[idx].Live then + if ggItems[idx].alive then begin result := cb(@ggItems[idx]); if result then exit; @@ -815,7 +815,7 @@ begin begin for idx := 0 to High(ggItems) do begin - if ggItems[idx].Live then + if ggItems[idx].alive then begin result := cb(@ggItems[idx]); if result then exit; @@ -890,18 +890,19 @@ begin for f := 0 to High(ggItems) do begin it := @ggItems[f]; - if not it.Live then continue; + if not it.alive then continue; case it.ItemType of - ITEM_KEY_RED: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 0.0, 0.0, 0.6); - ITEM_KEY_GREEN: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 0.0, 1.0, 0.0, 0.6); - ITEM_KEY_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 0.0, 0.0, 1.0, 0.6); + ITEM_KEY_RED: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 24, 1.0, 0.0, 0.0, 0.6); + ITEM_KEY_GREEN: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 24, 0.0, 1.0, 0.0, 0.6); + ITEM_KEY_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 24, 0.0, 0.0, 1.0, 0.6); ITEM_ARMOR_GREEN: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 42, 0.0, 1.0, 0.0, 0.6); ITEM_ARMOR_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 42, 0.0, 0.0, 1.0, 0.6); ITEM_SPHERE_BLUE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 0.0, 1.0, 0.0, 0.6); ITEM_SPHERE_WHITE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 1.0, 1.0, 0.6); ITEM_INVUL: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 0.0, 0.0, 0.6); ITEM_INVIS: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 1.0, 1.0, 0.0, 0.6); - ITEM_BOTTLE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 32, 0.0, 0.0, 1.0, 0.6); + ITEM_BOTTLE: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 16, 0.0, 0.0, 0.8, 0.6); + ITEM_HELMET: g_AddDynLight(it.Obj.X+(it.Obj.Rect.Width div 2), it.Obj.Y+(it.Obj.Rect.Height div 2), 16, 0.0, 0.8, 0.0, 0.6); end; end; end;