X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=718cfc27417387b748d4e4a187c97894b19cd819;hb=refs%2Fheads%2Fbuffers;hp=206d6e4d8301b561a14fb27b460731e9e78ad84c;hpb=422b1bad780adc75cee9edc8ef16092f29181951;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 206d6e4..718cfc2 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$MODE DELPHI} +{$INCLUDE g_amodes.inc} unit g_game; interface @@ -341,6 +341,7 @@ procedure g_ResetDynlights (); var lnum, idx: Integer; begin + if not gwin_has_stencil then begin g_dynLightCount := 0; exit; end; lnum := 0; for idx := 0 to g_dynLightCount-1 do begin @@ -367,6 +368,7 @@ end; procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single); begin + if not gwin_has_stencil then exit; if g_dynLightCount = length(g_dynLights) then SetLength(g_dynLights, g_dynLightCount+1024); g_dynLights[g_dynLightCount].x := x; g_dynLights[g_dynLightCount].y := y; @@ -381,6 +383,7 @@ end; procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single); begin + if not gwin_has_stencil then exit; if g_dynLightCount = length(g_dynLights) then SetLength(g_dynLights, g_dynLightCount+1024); g_dynLights[g_dynLightCount].x := x; g_dynLights[g_dynLightCount].y := y; @@ -394,6 +397,7 @@ begin Inc(g_dynLightCount); end; + type TEndCustomGameStat = record PlayerStat: TPlayerStatArray; @@ -1361,16 +1365,19 @@ begin end; // HACK: add dynlight here - if e_KeyPressed(IK_F8) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then - begin - g_playerLight := true; - end; - if e_KeyPressed(IK_F9) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then + if gwin_k8_enable_light_experiments then begin - g_playerLight := false; + if e_KeyPressed(IK_F8) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then + begin + g_playerLight := true; + end; + if e_KeyPressed(IK_F9) and gGameOn and (not gConsoleShow) and (g_ActiveWindow = nil) then + begin + g_playerLight := false; + end; end; - if (g_playerLight) then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6); + if gwin_has_stencil and g_playerLight then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6); end; procedure g_Game_Update(); @@ -3632,6 +3639,7 @@ var State: Byte; OuterLoop: Boolean; newResPath: string; + Len: Word; begin g_Game_Free(); @@ -3681,76 +3689,85 @@ begin Ptr := NetEvent.packet^.data; e_Raw_Seek(0); - MID := e_Raw_Read_Byte(Ptr); - - if (MID = NET_MSG_INFO) and (State = 0) then + while (State = 0) and (RawPos < NetEvent.packet^.dataLength) do begin - NetMyID := e_Raw_Read_Byte(Ptr); - NetPlrUID1 := e_Raw_Read_Word(Ptr); + Len := e_Raw_Read_Word(Ptr); + if Len = 0 then break; - WadName := e_Raw_Read_String(Ptr); - Map := e_Raw_Read_String(Ptr); + MID := e_Raw_Read_Byte(Ptr); + if NetDump then + g_Net_DumpRecvBuffer(NetEvent.packet^.data, NetEvent.packet^.dataLength); - gWADHash := e_Raw_Read_MD5(Ptr); + if (MID = NET_MSG_INFO) and (State = 0) then + begin + NetMyID := e_Raw_Read_Byte(Ptr); + NetPlrUID1 := e_Raw_Read_Word(Ptr); - gGameSettings.GameMode := e_Raw_Read_Byte(Ptr); - gSwitchGameMode := gGameSettings.GameMode; - gGameSettings.GoalLimit := e_Raw_Read_Word(Ptr); - gGameSettings.TimeLimit := e_Raw_Read_Word(Ptr); - gGameSettings.MaxLives := e_Raw_Read_Byte(Ptr); - gGameSettings.Options := e_Raw_Read_LongWord(Ptr); - T := e_Raw_Read_LongWord(Ptr); + WadName := e_Raw_Read_String(Ptr); + Map := e_Raw_Read_String(Ptr); - newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash); - if newResPath = '' then - begin - g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False); - newResPath := g_Res_DownloadWAD(WadName); + gWADHash := e_Raw_Read_MD5(Ptr); + + gGameSettings.GameMode := e_Raw_Read_Byte(Ptr); + gSwitchGameMode := gGameSettings.GameMode; + gGameSettings.GoalLimit := e_Raw_Read_Word(Ptr); + gGameSettings.TimeLimit := e_Raw_Read_Word(Ptr); + gGameSettings.MaxLives := e_Raw_Read_Byte(Ptr); + gGameSettings.Options := e_Raw_Read_LongWord(Ptr); + T := e_Raw_Read_LongWord(Ptr); + + newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash); if newResPath = '' then begin - g_FatalError(_lc[I_NET_ERR_HASH]); + g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False); + newResPath := ''; //g_Res_DownloadWAD(WadName); + if newResPath = '' then + begin + g_FatalError(_lc[I_NET_ERR_HASH]); + enet_packet_destroy(NetEvent.packet); + NetState := NET_STATE_NONE; + Exit; + end; + end; + newResPath := ExtractRelativePath(MapsDir, newResPath); + + gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model, + gPlayer1Settings.Color, + gPlayer1Settings.Team, False)); + + if gPlayer1 = nil then + begin + g_FatalError(Format(_lc[I_GAME_ERROR_PLAYER_CREATE], [1])); + enet_packet_destroy(NetEvent.packet); NetState := NET_STATE_NONE; Exit; end; - end; - newResPath := ExtractRelativePath(MapsDir, newResPath); - gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model, - gPlayer1Settings.Color, - gPlayer1Settings.Team, False)); + gPlayer1.Name := gPlayer1Settings.Name; + gPlayer1.UID := NetPlrUID1; + gPlayer1.Reset(True); - if gPlayer1 = nil then - begin - g_FatalError(Format(_lc[I_GAME_ERROR_PLAYER_CREATE], [1])); - - enet_packet_destroy(NetEvent.packet); - NetState := NET_STATE_NONE; - Exit; - end; + if not g_Game_StartMap(newResPath + ':\' + Map, True) then + begin + g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WadName + ':\' + Map])); - gPlayer1.Name := gPlayer1Settings.Name; - gPlayer1.UID := NetPlrUID1; - gPlayer1.Reset(True); + enet_packet_destroy(NetEvent.packet); + NetState := NET_STATE_NONE; + Exit; + end; - if not g_Game_StartMap(newResPath + ':\' + Map, True) then - begin - g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WadName + ':\' + Map])); + gTime := T; + State := 1; + OuterLoop := False; enet_packet_destroy(NetEvent.packet); - NetState := NET_STATE_NONE; - Exit; - end; - - gTime := T; - - State := 1; - OuterLoop := False; - enet_packet_destroy(NetEvent.packet); - break; - end - else - enet_packet_destroy(NetEvent.packet); + break; + end + else + RawPos := RawPos + Len-1; + end; + if State = 1 then break; end else if (NetEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then @@ -3787,7 +3804,7 @@ begin g_Player_Init(); NetState := NET_STATE_GAME; - MC_SEND_FullStateRequest; + MC_SEND_FullStateRequest(); e_WriteLog('NET: Connection successful.', MSG_NOTIFY); end;