X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fgame%2Fg_game.pas;h=27377d3e9ba44b57b660d9c0aa24ba5321c20452;hb=ac1d7f91183dbf6357baa265ae56b2603f4385c2;hp=2a72d3cbff95cf869e534fc704403ef0c18cf8a1;hpb=af1787819fb852141cfca39a570927c0d48ddb6a;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 2a72d3c..27377d3 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -137,7 +137,7 @@ procedure GameCheats(P: SSArray); procedure DebugCommands(P: SSArray); procedure g_Game_Process_Params; procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean); -procedure g_Game_StepLoading(); +procedure g_Game_StepLoading(Value: Integer = -1); procedure g_Game_ClearLoading(); procedure g_Game_SetDebugMode(); procedure DrawLoadingStat(); @@ -354,10 +354,9 @@ function gPause (): Boolean; inline; implementation uses -{$IFDEF USE_NANOGL} - nanoGL, -{$ELSE} - GL, GLExt, +{$INCLUDE ../nogl/noGLuses.inc} +{$IFDEF ENABLE_HOLMES} + g_holmes, {$ENDIF} e_texture, g_textures, g_main, g_window, g_menu, e_input, e_log, g_console, g_items, g_map, g_panel, @@ -365,7 +364,7 @@ uses g_triggers, g_monsters, e_sound, CONFIG, g_language, g_net, ENet, e_msg, g_netmsg, g_netmaster, - sfs, wadreader, g_holmes; + sfs, wadreader; var @@ -932,6 +931,7 @@ begin end else slWaitStr := _lc[I_NET_SLIST_ERROR]; + g_Serverlist_GenerateTable(slCurrent, slTable); end; g_Game_ExecuteEvent('ongameend'); @@ -1015,6 +1015,7 @@ begin gMusic.SetByName('MUSIC_INTERMUS'); gMusic.Play(); gState := STATE_INTERSINGLE; + e_UnpressAllKeys(); g_Game_ExecuteEvent('oninter'); end @@ -1665,12 +1666,14 @@ begin gMusic.Play(); gState := STATE_INTERCUSTOM; + e_UnpressAllKeys(); end else // Çàêîí÷èëàñü ïîñëåäíÿÿ êàðòà â Îäèíî÷íîé èãðå begin gMusic.SetByName('MUSIC_INTERMUS'); gMusic.Play(); gState := STATE_INTERSINGLE; + e_UnpressAllKeys(); end; g_Game_ExecuteEvent('oninter'); end @@ -1688,7 +1691,7 @@ begin end; STATE_SLIST: - g_Serverlist_Control(slCurrent); + g_Serverlist_Control(slCurrent, slTable); end; if g_Game_IsNet then @@ -3120,7 +3123,7 @@ var tagmask: Integer; pan: TPanel; begin - profileFrameDraw.sectionBegin(profname); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionBegin(profname); if gdbg_map_use_accel_render then begin tagmask := panelTypeToTag(panType); @@ -3136,31 +3139,31 @@ var begin if doDraw then g_Map_DrawPanels(panType, hasAmbient, ambColor); end; - profileFrameDraw.sectionEnd(); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionEnd(); end; procedure drawOther (profname: AnsiString; cb: TDrawCB); begin - profileFrameDraw.sectionBegin(profname); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionBegin(profname); if assigned(cb) then cb(); - profileFrameDraw.sectionEnd(); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionEnd(); end; begin - profileFrameDraw.sectionBegin('total'); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionBegin('total'); // our accelerated renderer will collect all panels to gDrawPanelList // we can use panel tag to render level parts (see GridTagXXX in g_map.pas) - profileFrameDraw.sectionBegin('collect'); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionBegin('collect'); if gdbg_map_use_accel_render then begin g_Map_CollectDrawPanels(sX, sY, sWidth, sHeight); end; - profileFrameDraw.sectionEnd(); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionEnd(); - profileFrameDraw.sectionBegin('skyback'); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionBegin('skyback'); g_Map_DrawBack(backXOfs, backYOfs); - profileFrameDraw.sectionEnd(); + if (profileFrameDraw <> nil) then profileFrameDraw.sectionEnd(); if setTransMatrix then begin @@ -3217,7 +3220,7 @@ begin g_Player_DrawHealth(); end; - profileFrameDraw.mainEnd(); // map rendering + if (profileFrameDraw <> nil) then profileFrameDraw.mainEnd(); // map rendering end; @@ -3257,7 +3260,7 @@ begin end; if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('RENDER', g_profile_history_size); - profileFrameDraw.mainBegin(g_profile_frame_draw); + if (profileFrameDraw <> nil) then profileFrameDraw.mainBegin(g_profile_frame_draw); gPlayerDrawn := p; @@ -3390,11 +3393,13 @@ begin p.viewPortW := sWidth; p.viewPortH := sHeight; +{$IFDEF ENABLE_HOLMES} if (p = gPlayer1) then begin g_Holmes_plrViewPos(sX, sY); g_Holmes_plrViewSize(sWidth, sHeight); end; +{$ENDIF} renderMapInternal(-c, -d, true); @@ -3436,9 +3441,9 @@ var px: Integer = -1; py: Integer = -1; begin - if g_profile_frame_draw then px := px-drawProfiles(px, py, profileFrameDraw); - if g_profile_collision then begin px := px-drawProfiles(px, py, profMapCollision); py -= calcProfilesHeight(profMonsLOS); end; - if g_profile_los then begin px := px-drawProfiles(px, py, profMonsLOS); py -= calcProfilesHeight(profMonsLOS); end; + if g_profile_frame_draw and (profileFrameDraw <> nil) then px := px-drawProfiles(px, py, profileFrameDraw); + if g_profile_collision and (profMapCollision <> nil) then begin px := px-drawProfiles(px, py, profMapCollision); py -= calcProfilesHeight(profMonsLOS); end; + if g_profile_los and (profMonsLOS <> nil) then begin px := px-drawProfiles(px, py, profMonsLOS); py -= calcProfilesHeight(profMonsLOS); end; end; procedure g_Game_Draw(); @@ -3584,8 +3589,10 @@ begin e_DrawLine(2, 0, gScreenHeight div 2, gScreenWidth, gScreenHeight div 2, 0, 0, 0); end; +{$IFDEF ENABLE_HOLMES} // draw inspector if (g_holmes_enabled) then g_Holmes_Draw(); +{$ENDIF} if MessageText <> '' then begin @@ -3763,7 +3770,7 @@ begin //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); end; - g_Serverlist_Draw(slCurrent); + g_Serverlist_Draw(slCurrent, slTable); end; end; @@ -3797,7 +3804,9 @@ begin if gGameOn then drawProfilers(); +{$IFDEF ENABLE_HOLMES} g_Holmes_DrawUI(); +{$ENDIF} g_Touch_Draw; end; @@ -4527,7 +4536,7 @@ begin gWADHash := MD5File(MapsDir + NewWAD); g_Game_LoadWAD(NewWAD); end else - // hash recieved in MC_RECV_GameEvent -> NET_EV_MAPSTART + // hash received in MC_RECV_GameEvent -> NET_EV_MAPSTART g_Game_ClientWAD(NewWAD, gWADHash); end else ResName := Map; @@ -7312,13 +7321,18 @@ begin ProcessLoading(true); end; -procedure g_Game_StepLoading(); +procedure g_Game_StepLoading(Value: Integer = -1); begin with LoadingStat do begin - Inc(CurValue); - Inc(ShowCount); - if (ShowCount > LOADING_SHOW_STEP) then + if Value = -1 then + begin + Inc(CurValue); + Inc(ShowCount); + end + else + CurValue := Value; + if (ShowCount > LOADING_SHOW_STEP) or (Value > -1) then begin ShowCount := 0; ProcessLoading(); @@ -7588,7 +7602,9 @@ begin conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true); conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true); +{$IFDEF ENABLE_HOLMES} conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true); +{$ENDIF} conRegVar('dbg_ignore_level_bounds', @g_dbg_ignore_bounds, 'ignore level bounds', '', false);