X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=f4882b6bdbc95b4069ef439cf192f1da7cb0a4a9;hb=02e6aa22f21119c1a329e7b5321b94bf9fe9d4d7;hp=b198947e145dffab6b26a56ae1591635a59cfb39;hpb=674a902ed6e62076ad4bafc2b8f74d181f6bf287;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index b198947..f4882b6 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -19,8 +19,10 @@ unit g_game; interface uses - g_basic, g_player, e_graphics, Classes, g_res_downloader, - SysUtils, g_sound, g_gui, MAPSTRUCT, wadreader, md5, xprofiler; + SysUtils, Classes, + MAPDEF, + g_basic, g_player, e_graphics, g_res_downloader, + g_sound, g_gui, wadreader, md5, xprofiler; type TGameSettings = record @@ -63,14 +65,14 @@ type THearPoint = record Active: Boolean; - Coords: TPoint; + Coords: TDFPoint; end; function g_Game_IsNet(): Boolean; function g_Game_IsServer(): Boolean; function g_Game_IsClient(): Boolean; procedure g_Game_Init(); -procedure g_Game_Free(); +procedure g_Game_Free (freeTextures: Boolean=true); procedure g_Game_LoadData(); procedure g_Game_FreeData(); procedure g_Game_Update(); @@ -95,13 +97,14 @@ procedure g_Game_RestartLevel(); procedure g_Game_RestartRound(NoMapRestart: Boolean = False); procedure g_Game_ClientWAD(NewWAD: String; WHash: TMD5Digest); procedure g_Game_SaveOptions(); -function g_Game_StartMap(Map: String; Force: Boolean = False): Boolean; -procedure g_Game_ChangeMap(MapPath: String); -procedure g_Game_ExitLevel(Map: Char16); +function g_Game_StartMap(Map: String; Force: Boolean = False; const oldMapPath: AnsiString=''): Boolean; +procedure g_Game_ChangeMap(const MapPath: String); +procedure g_Game_ExitLevel(const Map: AnsiString); function g_Game_GetFirstMap(WAD: String): String; function g_Game_GetNextMap(): String; procedure g_Game_NextLevel(); procedure g_Game_Pause(Enable: Boolean); +procedure g_Game_HolmesPause(Enable: Boolean); procedure g_Game_InGameMenu(Show: Boolean); function g_Game_IsWatchedPlayer(UID: Word): Boolean; function g_Game_IsWatchedTeam(Team: Byte): Boolean; @@ -209,9 +212,9 @@ var gPlayer1Settings: TPlayerSettings; gPlayer2Settings: TPlayerSettings; gGameOn: Boolean; - gPlayerScreenSize: TPoint; - gPlayer1ScreenCoord: TPoint; - gPlayer2ScreenCoord: TPoint; + gPlayerScreenSize: TDFPoint; + gPlayer1ScreenCoord: TDFPoint; + gPlayer2ScreenCoord: TDFPoint; gPlayer1: TPlayer = nil; gPlayer2: TPlayer = nil; gPlayerDrawn: TPlayer = nil; @@ -229,7 +232,8 @@ var gServInterTime: Byte = 0; gGameStartTime: LongWord = 0; gTotalMonsters: Integer = 0; - gPause: Boolean; + gPauseMain: Boolean = false; + gPauseHolmes: Boolean = false; gShowTime: Boolean = True; gShowFPS: Boolean = False; gShowGoals: Boolean = True; @@ -315,32 +319,51 @@ var g_profile_los: Boolean = false; g_profile_history_size: Integer = 1000; + g_rlayer_back: Boolean = true; + g_rlayer_step: Boolean = true; + g_rlayer_wall: Boolean = true; + g_rlayer_door: Boolean = true; + g_rlayer_acid1: Boolean = true; + g_rlayer_acid2: Boolean = true; + g_rlayer_water: Boolean = true; + g_rlayer_fore: Boolean = true; + procedure g_ResetDynlights (); procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single); procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single); -function conIsCheatsEnabled (): Boolean; +function conIsCheatsEnabled (): Boolean; inline; +function gPause (): Boolean; inline; implementation uses - g_textures, g_main, g_window, g_menu, + e_texture, g_textures, g_main, g_window, g_menu, e_input, e_log, g_console, g_items, g_map, g_panel, g_playermodel, g_gfx, g_options, g_weapons, Math, - g_triggers, MAPDEF, g_monsters, e_sound, CONFIG, - BinEditor, g_language, g_net, SDL, + g_triggers, g_monsters, e_sound, CONFIG, + g_language, g_net, SDL, ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt, utils, sfs, g_holmes; // ////////////////////////////////////////////////////////////////////////// // -function conIsCheatsEnabled (): Boolean; +function gPause (): Boolean; inline; begin result := gPauseMain or gPauseHolmes; end; + + +// ////////////////////////////////////////////////////////////////////////// // +function conIsCheatsEnabled (): Boolean; inline; begin result := false; - if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and - (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then exit; + if g_Game_IsNet then exit; + if not gDebugMode then + begin + //if not gCheats then exit; + if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit; + if not (gGameSettings.GameMode in [GM_COOP, GM_SINGLE]) then exit; + end; result := true; end; @@ -451,7 +474,8 @@ begin if (y < 0) then y := gScreenHeight-(hgt-1)+y; // background //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 255, 255, 255, 200, B_BLEND); - e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE); + //e_DrawFillQuad(x, y, x+wdt-1, y+hgt-1, 20, 20, 20, 0, B_NONE); + e_DarkenQuadWH(x, y, wdt, hgt, 150); // title yy := y+2; for ii := 0 to High(prof.bars) do @@ -782,7 +806,7 @@ begin {$IF DEFINED(D2F_DEBUG)} if gPlayer1 <> nil then gPlayer1.NoTarget := True; - gAimLine := true; + gAimLine := g_dbg_aimline_on; {$ENDIF} end; @@ -840,8 +864,9 @@ begin MH_SEND_GameEvent(NET_EV_MAPEND, Byte(gMissionFailed)); // Ñòîï èãðà: - gPause := False; - gGameOn := False; + gPauseMain := false; + gPauseHolmes := false; + gGameOn := false; g_Game_StopAllSounds(False); @@ -1248,8 +1273,9 @@ begin until FindNext(SR) <> 0; FindClose(SR); - gGameOn := False; - gPause := False; + gGameOn := false; + gPauseMain := false; + gPauseHolmes := false; gTime := 0; LastScreenShot := 0; @@ -1287,12 +1313,12 @@ begin end; end; -procedure g_Game_Free(); +procedure g_Game_Free(freeTextures: Boolean=true); begin if NetMode = NET_CLIENT then g_Net_Disconnect(); if NetMode = NET_SERVER then g_Net_Host_Die(); - g_Map_Free(); + g_Map_Free(freeTextures); g_Player_Free(); g_Player_RemoveAllCorpses(); @@ -1475,20 +1501,30 @@ var function sendMonsPos (mon: TMonster): Boolean; begin result := false; // don't stop - if (mon.MonsterType = MONSTER_BARREL) then + // this will also reset "need-send" flag + if mon.gncNeedSend then + begin + MH_SEND_MonsterPos(mon.UID); + end + else if (mon.MonsterType = MONSTER_BARREL) then begin if (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then MH_SEND_MonsterPos(mon.UID); end - else - if (mon.MonsterState <> MONSTATE_SLEEP) then - begin - if (mon.MonsterState <> MONSTATE_DEAD) or (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then - begin - MH_SEND_MonsterPos(mon.UID); - end; - end; + else if (mon.MonsterState <> MONSTATE_SLEEP) then + begin + if (mon.MonsterState <> MONSTATE_DEAD) or (mon.GameVelX <> 0) or (mon.GameVelY <> 0) then MH_SEND_MonsterPos(mon.UID); + end; end; + function sendMonsPosUnexpected (mon: TMonster): Boolean; + begin + result := false; // don't stop + // this will also reset "need-send" flag + if mon.gncNeedSend then MH_SEND_MonsterPos(mon.UID); + end; + +var + reliableUpdate: Boolean; begin g_ResetDynlights(); // Ïîðà âûêëþ÷àòü èãðó: @@ -1832,13 +1868,16 @@ begin g_GFX_Update(); g_Player_UpdateAll(); g_Player_UpdatePhysicalObjects(); - if gGameSettings.GameType = GT_SERVER then - if Length(gMonstersSpawned) > 0 then + + // server: send newly spawned monsters unconditionally + if (gGameSettings.GameType = GT_SERVER) then + begin + if (Length(gMonstersSpawned) > 0) then begin - for I := 0 to High(gMonstersSpawned) do - MH_SEND_MonsterSpawn(gMonstersSpawned[I]); + for I := 0 to High(gMonstersSpawned) do MH_SEND_MonsterSpawn(gMonstersSpawned[I]); SetLength(gMonstersSpawned, 0); end; + end; if (gSoundTriggerTime > 8) then begin @@ -1846,49 +1885,65 @@ begin gSoundTriggerTime := 0; end else + begin Inc(gSoundTriggerTime); + end; if (NetMode = NET_SERVER) then begin Inc(NetTimeToUpdate); Inc(NetTimeToReliable); - if NetTimeToReliable >= NetRelupdRate then + + // send monster updates + if (NetTimeToReliable >= NetRelupdRate) or (NetTimeToUpdate >= NetUpdateRate) then begin + // send all monsters (periodic sync) + reliableUpdate := (NetTimeToReliable >= NetRelupdRate); + for I := 0 to High(gPlayers) do - if gPlayers[I] <> nil then - MH_SEND_PlayerPos(True, gPlayers[I].UID); + begin + if (gPlayers[I] <> nil) then MH_SEND_PlayerPos(reliableUpdate, gPlayers[I].UID); + end; g_Mons_ForEach(sendMonsPos); - NetTimeToReliable := 0; - NetTimeToUpdate := NetUpdateRate; + if reliableUpdate then + begin + NetTimeToReliable := 0; + NetTimeToUpdate := NetUpdateRate; + end + else + begin + NetTimeToUpdate := 0; + end; end - else if NetTimeToUpdate >= NetUpdateRate then + else begin - if gPlayers <> nil then - for I := 0 to High(gPlayers) do - if gPlayers[I] <> nil then - MH_SEND_PlayerPos(False, gPlayers[I].UID); - - g_Mons_ForEach(sendMonsPos); - - NetTimeToUpdate := 0; + // send only mosters with some unexpected changes + g_Mons_ForEach(sendMonsPosUnexpected); end; + // send unexpected platform changes + g_Map_NetSendInterestingPanels(); + if NetUseMaster then + begin if gTime >= NetTimeToMaster then begin if (NetMHost = nil) or (NetMPeer = nil) then - if not g_Net_Slist_Connect then - g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR]); + begin + if not g_Net_Slist_Connect then g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR]); + end; g_Net_Slist_Update; NetTimeToMaster := gTime + NetMasterRate; end; + end; end - else - if NetMode = NET_CLIENT then - MC_SEND_PlayerPos(); + else if (NetMode = NET_CLIENT) then + begin + MC_SEND_PlayerPos(); + end; end; // if gameOn ... // Àêòèâíî îêíî èíòåðôåéñà - ïåðåäàåì êëàâèøè åìó: @@ -1980,7 +2035,11 @@ begin UPSTime := Time; end; - if gGameOn then g_Weapon_AddDynLights(); + if gGameOn then + begin + g_Weapon_AddDynLights(); + g_Items_AddDynLights(); + end; end; procedure g_Game_LoadData(); @@ -1995,12 +2054,12 @@ begin g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDJET', GameWAD+':TEXTURES\JETBAR'); g_Texture_CreateWADEx('TEXTURE_PLAYER_HUDBG', GameWAD+':TEXTURES\HUDBG'); g_Texture_CreateWADEx('TEXTURE_PLAYER_ARMORHUD', GameWAD+':TEXTURES\ARMORHUD'); - g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG', GameWAD+':TEXTURES\FLAGHUD_RB'); - g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_S', GameWAD+':TEXTURES\FLAGHUD_RS'); - g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_D', GameWAD+':TEXTURES\FLAGHUD_RD'); - g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG', GameWAD+':TEXTURES\FLAGHUD_BB'); - g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_S', GameWAD+':TEXTURES\FLAGHUD_BS'); - g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_BD'); + g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG', GameWAD+':TEXTURES\FLAGHUD_RB', GameWAD+':TEXTURES\FLAGHUD_R_BASE'); + g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_S', GameWAD+':TEXTURES\FLAGHUD_RS', GameWAD+':TEXTURES\FLAGHUD_R_STOLEN'); + g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_D', GameWAD+':TEXTURES\FLAGHUD_RD', GameWAD+':TEXTURES\FLAGHUD_R_DROP'); + g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG', GameWAD+':TEXTURES\FLAGHUD_BB', GameWAD+':TEXTURES\FLAGHUD_B_BASE'); + g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_S', GameWAD+':TEXTURES\FLAGHUD_BS', GameWAD+':TEXTURES\FLAGHUD_B_STOLEN'); + g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_BD', GameWAD+':TEXTURES\FLAGHUD_B_DROP'); g_Texture_CreateWADEx('TEXTURE_PLAYER_TALKBUBBLE', GameWAD+':TEXTURES\TALKBUBBLE'); g_Texture_CreateWADEx('TEXTURE_PLAYER_INVULPENTA', GameWAD+':TEXTURES\PENTA'); g_Frames_CreateWAD(nil, 'FRAMES_TELEPORT', GameWAD+':TEXTURES\TELEPORT', 64, 64, 10, False); @@ -2479,7 +2538,7 @@ var result := false; // don't stop with mon do begin - if Live then + if alive then begin // Ëåâûé âåðõíèé óãîë aX := Obj.X div ScaleSz + 1; @@ -2642,7 +2701,7 @@ begin // Ðèñóåì èãðîêîâ: for a := 0 to High(gPlayers) do if gPlayers[a] <> nil then with gPlayers[a] do - if Live then begin + if alive then begin // Ëåâûé âåðõíèé óãîë: aX := Obj.X div ScaleSz + 1; aY := Obj.Y div ScaleSz + 1; @@ -2669,15 +2728,57 @@ begin end; +procedure renderAmbientQuad (hasAmbient: Boolean; constref ambColor: TDFColor); +begin + if not hasAmbient then exit; + e_AmbientQuad(sX, sY, sWidth, sHeight, ambColor.r, ambColor.g, ambColor.b, ambColor.a); +end; + + // setup sX, sY, sWidth, sHeight, and transformation matrix before calling this! +//FIXME: broken for splitscreen mode procedure renderDynLightsInternal (); var + //hasAmbient: Boolean; + //ambColor: TDFColor; lln: Integer; lx, ly, lrad: Integer; + scxywh: array[0..3] of GLint; + wassc: Boolean; begin + if e_NoGraphics then exit; + //TODO: lights should be in separate grid, i think // but on the other side: grid may be slower for dynlights, as their lifetime is short - if not gwin_has_stencil or (g_dynLightCount < 1) then exit; + if (not gwin_k8_enable_light_experiments) or (not gwin_has_stencil) or (g_dynLightCount < 1) then exit; + + // rendering mode + //ambColor := gCurrentMap['light_ambient'].rgba; + //hasAmbient := (not ambColor.isOpaque) or (not ambColor.isBlack); + + { // this will multiply incoming color to alpha from framebuffer + glEnable(GL_BLEND); + glBlendFunc(GL_DST_ALPHA, GL_ONE); + } + + (* + * light rendering: (INVALID!) + * glStencilFunc(GL_EQUAL, 0, $ff); + * for each light: + * glClear(GL_STENCIL_BUFFER_BIT); + * glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); + * draw shadow volume into stencil buffer + * glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); // modify color buffer + * glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); // don't modify stencil buffer + * turn off blending + * draw color-less quad with light alpha (WARNING! don't touch color!) + * glEnable(GL_BLEND); + * glBlendFunc(GL_DST_ALPHA, GL_ONE); + * draw all geometry up to and including walls (with alpha-testing, probably) -- this does lighting + *) + + wassc := (glIsEnabled(GL_SCISSOR_TEST) <> 0); + if wassc then glGetIntegerv(GL_SCISSOR_BOX, @scxywh[0]) else glGetIntegerv(GL_VIEWPORT, @scxywh[0]); // setup OpenGL parameters glStencilMask($FFFFFFFF); @@ -2692,16 +2793,24 @@ begin lx := g_dynLights[lln].x; ly := g_dynLights[lln].y; lrad := g_dynLights[lln].radius; - if lrad < 3 then continue; + if (lrad < 3) then continue; - if lx-sX+lrad < 0 then continue; - if ly-sY+lrad < 0 then continue; - if lx-sX-lrad >= gPlayerScreenSize.X then continue; - if ly-sY-lrad >= gPlayerScreenSize.Y then continue; + if (lx-sX+lrad < 0) then continue; + if (ly-sY+lrad < 0) then continue; + if (lx-sX-lrad >= gPlayerScreenSize.X) then continue; + if (ly-sY-lrad >= gPlayerScreenSize.Y) then continue; // set scissor to optimize drawing - glScissor((lx-sX)-lrad+2, gPlayerScreenSize.Y-(ly-sY)-lrad-1+2, lrad*2-4, lrad*2-4); - // no need to clear stencil buffer, light blitting will do it for us + if (g_dbg_scale = 1.0) then + begin + glScissor((lx-sX)-lrad+2, gPlayerScreenSize.Y-(ly-sY)-lrad-1+2, lrad*2-4, lrad*2-4); + end + else + begin + glScissor(0, 0, gWinSizeX, gWinSizeY); + end; + // no need to clear stencil buffer, light blitting will do it for us... but only for normal scale + if (g_dbg_scale <> 1.0) then glClear(GL_STENCIL_BUFFER_BIT); glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); // draw extruded panels glDisable(GL_TEXTURE_2D); @@ -2730,17 +2839,45 @@ begin glDisable(GL_STENCIL_TEST); glDisable(GL_BLEND); glDisable(GL_SCISSOR_TEST); - glScissor(0, 0, sWidth, sHeight); + //glScissor(0, 0, sWidth, sHeight); + + glScissor(scxywh[0], scxywh[1], scxywh[2], scxywh[3]); + if wassc then glEnable(GL_SCISSOR_TEST) else glDisable(GL_SCISSOR_TEST); +end; + + +function fixViewportForScale (): Boolean; +var + nx0, ny0, nw, nh: Integer; +begin + result := false; + if (g_dbg_scale <> 1.0) then + begin + result := true; + nx0 := round(sX-(gPlayerScreenSize.X-(sWidth*g_dbg_scale))/2/g_dbg_scale); + ny0 := round(sY-(gPlayerScreenSize.Y-(sHeight*g_dbg_scale))/2/g_dbg_scale); + nw := round(sWidth/g_dbg_scale); + nh := round(sHeight/g_dbg_scale); + sX := nx0; + sY := ny0; + sWidth := nw; + sHeight := nh; + end; end; // setup sX, sY, sWidth, sHeight, and transformation matrix before calling this! // WARNING! this WILL CALL `glTranslatef()`, but won't restore matrices! -procedure renderMapInternal (backXOfs, backYOfs: Integer; transX, transY: Integer; setTransMatrix: Boolean); +procedure renderMapInternal (backXOfs, backYOfs: Integer; setTransMatrix: Boolean); type TDrawCB = procedure (); - procedure drawPanelType (profname: AnsiString; panType: DWord); +var + hasAmbient: Boolean; + ambColor: TDFColor; + doAmbient: Boolean = false; + + procedure drawPanelType (profname: AnsiString; panType: DWord; doDraw: Boolean); var tagmask: Integer; pan: TPanel; @@ -2749,28 +2886,17 @@ type if gdbg_map_use_accel_render then begin tagmask := panelTypeToTag(panType); - {$IF TRUE} while (gDrawPanelList.count > 0) do begin pan := TPanel(gDrawPanelList.front()); if ((pan.tag and tagmask) = 0) then break; - pan.Draw(); - gDrawPanelList.popFront(); - end; - {$ELSE} - e_WriteLog(Format('=== PANELS: %d ===', [gDrawPanelList.count]), MSG_NOTIFY); - while (gDrawPanelList.count > 0) do - begin - pan := TPanel(gDrawPanelList.front()); - e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.arrIdx: %d', [tagmask, pan.tag, pan.arrIdx]), MSG_NOTIFY); - pan.Draw(); + if doDraw then pan.Draw(doAmbient, ambColor); gDrawPanelList.popFront(); end; - {$ENDIF} end else begin - g_Map_DrawPanels(panType); + if doDraw then g_Map_DrawPanels(panType, hasAmbient, ambColor); end; profileFrameDraw.sectionEnd(); end; @@ -2798,25 +2924,54 @@ begin g_Map_DrawBack(backXOfs, backYOfs); profileFrameDraw.sectionEnd(); - if (setTransMatrix) then glTranslatef(transX, transY, 0); + if setTransMatrix then + begin + //if (g_dbg_scale <> 1.0) then glTranslatef(0.0, -0.375/2, 0); + glScalef(g_dbg_scale, g_dbg_scale, 1.0); + glTranslatef(-sX, -sY, 0); + end; + + // rendering mode + ambColor := gCurrentMap['light_ambient'].rgba; + hasAmbient := (not ambColor.isOpaque) or (not ambColor.isBlack); + + { + if hasAmbient then + begin + //writeln('color: (', ambColor.r, ',', ambColor.g, ',', ambColor.b, ',', ambColor.a, ')'); + glColor4ub(ambColor.r, ambColor.g, ambColor.b, ambColor.a); + glClear(GL_COLOR_BUFFER_BIT); + end; + } + //writeln('color: (', ambColor.r, ',', ambColor.g, ',', ambColor.b, ',', ambColor.a, ')'); + - drawPanelType('*back', PANEL_BACK); - drawPanelType('*step', PANEL_STEP); + drawPanelType('*back', PANEL_BACK, g_rlayer_back); + drawPanelType('*step', PANEL_STEP, g_rlayer_step); drawOther('items', @g_Items_Draw); drawOther('weapons', @g_Weapon_Draw); drawOther('shells', @g_Player_DrawShells); drawOther('drawall', @g_Player_DrawAll); drawOther('corpses', @g_Player_DrawCorpses); - drawPanelType('*wall', PANEL_WALL); + drawPanelType('*wall', PANEL_WALL, g_rlayer_wall); drawOther('monsters', @g_Monsters_Draw); - drawPanelType('*door', PANEL_CLOSEDOOR); + drawOther('itemdrop', @g_Items_DrawDrop); + drawPanelType('*door', PANEL_CLOSEDOOR, g_rlayer_door); drawOther('gfx', @g_GFX_Draw); drawOther('flags', @g_Map_DrawFlags); - drawPanelType('*acid1', PANEL_ACID1); - drawPanelType('*acid2', PANEL_ACID2); - drawPanelType('*water', PANEL_WATER); + drawPanelType('*acid1', PANEL_ACID1, g_rlayer_acid1); + drawPanelType('*acid2', PANEL_ACID2, g_rlayer_acid2); + drawPanelType('*water', PANEL_WATER, g_rlayer_water); drawOther('dynlights', @renderDynLightsInternal); - drawPanelType('*fore', PANEL_FORE); + + if hasAmbient {and ((not g_playerLight) or (not gwin_has_stencil) or (g_dynLightCount < 1))} then + begin + renderAmbientQuad(hasAmbient, ambColor); + end; + + doAmbient := true; + drawPanelType('*fore', PANEL_FORE, g_rlayer_fore); + if g_debug_HealthBar then begin @@ -2843,7 +2998,8 @@ begin sWidth := w; sHeight := h; - renderMapInternal(-bx, -by, -x, -y, true); + fixViewportForScale(); + renderMapInternal(-bx, -by, true); glPopMatrix(); end; @@ -2853,7 +3009,6 @@ procedure DrawPlayer(p: TPlayer); var px, py, a, b, c, d: Integer; //R: TRect; - begin if (p = nil) or (p.FDummy) then begin @@ -2871,26 +3026,35 @@ begin glPushMatrix(); px := p.GameX + PLAYER_RECT_CX; - py := p.GameY + PLAYER_RECT_CY; + py := p.GameY + PLAYER_RECT_CY+p.Obj.slopeUpLeft; - if px > (gPlayerScreenSize.X div 2) then a := -px+(gPlayerScreenSize.X div 2) else a := 0; - if py > (gPlayerScreenSize.Y div 2) then b := -py+(gPlayerScreenSize.Y div 2) else b := 0; + if (g_dbg_scale = 1.0) then + begin + if (px > (gPlayerScreenSize.X div 2)) then a := -px+(gPlayerScreenSize.X div 2) else a := 0; + if (py > (gPlayerScreenSize.Y div 2)) then b := -py+(gPlayerScreenSize.Y div 2) else b := 0; - if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X; - if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y; + if (px > gMapInfo.Width-(gPlayerScreenSize.X div 2)) then a := -gMapInfo.Width+gPlayerScreenSize.X; + if (py > gMapInfo.Height-(gPlayerScreenSize.Y div 2)) then b := -gMapInfo.Height+gPlayerScreenSize.Y; - if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0 - else if (gMapInfo.Width < gPlayerScreenSize.X) then - begin - // hcenter - a := (gPlayerScreenSize.X-gMapInfo.Width) div 2; - end; + if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0 + else if (gMapInfo.Width < gPlayerScreenSize.X) then + begin + // hcenter + a := (gPlayerScreenSize.X-gMapInfo.Width) div 2; + end; - if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0 - else if (gMapInfo.Height < gPlayerScreenSize.Y) then + if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0 + else if (gMapInfo.Height < gPlayerScreenSize.Y) then + begin + // vcenter + b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2; + end; + end + else begin - // vcenter - b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2; + // scaled, ignore level bounds + a := -px+(gPlayerScreenSize.X div 2); + b := -py+(gPlayerScreenSize.Y div 2); end; if p.IncCam <> 0 then @@ -2937,17 +3101,17 @@ begin //glTranslatef(a, b+p.IncCam, 0); + if (p = gPlayer1) then g_Holmes_plrViewSize(sWidth, sHeight); + + fixViewportForScale(); p.viewPortX := sX; p.viewPortY := sY; p.viewPortW := sWidth; p.viewPortH := sHeight; - if (p = gPlayer1) then - begin - g_Holmes_plrView(p.viewPortX, p.viewPortY, p.viewPortW, p.viewPortH); - end; + if (p = gPlayer1) then g_Holmes_plrViewPos(sX, sY); - renderMapInternal(-c, -d, a, b+p.IncCam, true); + renderMapInternal(-c, -d, true); if p.FSpectator then e_TextureFontPrintEx(p.GameX + PLAYER_RECT_CX - 4, @@ -3193,9 +3357,10 @@ begin end; end; - if gPause and gGameOn and (g_ActiveWindow = nil) then + if gPauseMain and gGameOn and (g_ActiveWindow = nil) then begin - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); e_CharFont_GetSize(gMenuFont, _lc[I_MENU_PAUSE], w, h); e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(w div 2), @@ -3206,18 +3371,33 @@ begin begin if (gState = STATE_MENU) then begin - if ((g_ActiveWindow = nil) or (g_ActiveWindow.BackTexture = '')) then + if (g_ActiveWindow = nil) or (g_ActiveWindow.BackTexture = '') then begin - if g_Texture_Get('MENU_BACKGROUND', ID) then - e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight) + if g_Texture_Get('MENU_BACKGROUND', ID) then e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight) else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); end; - if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + // F3 at menu will show game loading dialog + if e_KeyPressed(IK_F3) then g_Menu_Show_LoadMenu(true); + if (g_ActiveWindow <> nil) then + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end + else + begin + // F3 at titlepic will show game loading dialog + if e_KeyPressed(IK_F3) then + begin + g_Menu_Show_LoadMenu(true); + if (g_ActiveWindow <> nil) then e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; + end; end; if gState = STATE_FOLD then + begin e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter); + end; if gState = STATE_INTERCUSTOM then begin @@ -3238,13 +3418,18 @@ begin DrawCustomStat(); if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; if gState = STATE_INTERSINGLE then begin if EndingGameCounter > 0 then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter) + begin + e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 0, 0, 0, EndingGameCounter); + end else begin back := 'INTER'; @@ -3257,7 +3442,10 @@ begin DrawSingleStat(); if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; end; @@ -3273,7 +3461,10 @@ begin e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0); if g_ActiveWindow <> nil then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; end; if gState = STATE_SLIST then @@ -3281,7 +3472,8 @@ begin if g_Texture_Get('MENU_BACKGROUND', ID) then begin e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight); - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); end; g_Serverlist_Draw(slCurrent); end; @@ -3290,7 +3482,10 @@ begin if g_ActiveWindow <> nil then begin if gGameOn then - e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + begin + //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + end; g_ActiveWindow.Draw(); end; @@ -3316,6 +3511,8 @@ begin drawTime(gScreenWidth-72, gScreenHeight-16); if gGameOn then drawProfilers(); + + g_Holmes_DrawUI(); end; procedure g_Game_Quit(); @@ -3944,7 +4141,7 @@ begin end; end; - ProcessLoading(); + ProcessLoading(true); e_PollInput(); @@ -3976,7 +4173,7 @@ begin g_Options_Write_Video(GameDir+'/'+CONFIG_FILENAME); end; -procedure g_Game_ChangeMap(MapPath: String); +procedure g_Game_ChangeMap(const MapPath: String); var Force: Boolean; begin @@ -4004,15 +4201,15 @@ begin MessageTime := 0; gGameOn := False; g_Game_ClearLoading(); - g_Game_StartMap(Map, True); + g_Game_StartMap(Map, True, gCurrentMapFileName); end; -function g_Game_StartMap(Map: String; Force: Boolean = False): Boolean; +function g_Game_StartMap(Map: String; Force: Boolean = False; const oldMapPath: AnsiString=''): Boolean; var NewWAD, ResName: String; I: Integer; begin - g_Map_Free(); + g_Map_Free((Map <> gCurrentMapFileName) and (oldMapPath <> gCurrentMapFileName)); g_Player_RemoveAllCorpses(); if (not g_Game_IsClient) and @@ -4028,7 +4225,7 @@ begin g_Player_ResetTeams(); - if Pos(':\', Map) > 0 then + if isWadPath(Map) then begin NewWAD := g_ExtractWadName(Map); ResName := g_ExtractFileName(Map); @@ -4070,7 +4267,8 @@ begin end; gExit := 0; - gPause := False; + gPauseMain := false; + gPauseHolmes := false; gTime := 0; NetTimeToUpdate := 1; NetTimeToReliable := 0; @@ -4160,7 +4358,7 @@ begin MapList := nil; end; -procedure g_Game_ExitLevel(Map: Char16); +procedure g_Game_ExitLevel(const Map: AnsiString); begin gNextMap := Map; @@ -4395,7 +4593,7 @@ end; procedure g_Game_DeleteTestMap(); var a: Integer; - MapName: Char16; + //MapName: AnsiString; WadName: string; { WAD: TWADFile; @@ -4403,16 +4601,16 @@ var time: Integer; } begin - a := Pos('.wad:\', gMapToDelete); - if a = 0 then - Exit; + a := Pos('.wad:\', toLowerCase1251(gMapToDelete)); + if (a = 0) then a := Pos('.wad:/', toLowerCase1251(gMapToDelete)); + if (a = 0) then exit; -// Âûäåëÿåì èìÿ wad-ôàéëà è èìÿ êàðòû: - WadName := Copy(gMapToDelete, 1, a + 3); - Delete(gMapToDelete, 1, a + 5); + // Âûäåëÿåì èìÿ wad-ôàéëà è èìÿ êàðòû + WadName := Copy(gMapToDelete, 1, a+3); + Delete(gMapToDelete, 1, a+5); gMapToDelete := UpperCase(gMapToDelete); - MapName := ''; - CopyMemory(@MapName[0], @gMapToDelete[1], Min(16, Length(gMapToDelete))); + //MapName := ''; + //CopyMemory(@MapName[0], @gMapToDelete[1], Min(16, Length(gMapToDelete))); { // Èìÿ êàðòû íå ñòàíäàðòíîå òåñòîâîå: @@ -4985,16 +5183,29 @@ begin end; end; +procedure PrintHeapStats(); +var + hs: TFPCHeapStatus; +begin + hs := GetFPCHeapStatus(); + e_LogWriteLn ('v===== heap status =====v'); + e_LogWriteFln('max heap size = %d k', [hs.MaxHeapSize div 1024]); + e_LogWriteFln('max heap used = %d k', [hs.MaxHeapUsed div 1024]); + e_LogWriteFln('cur heap size = %d k', [hs.CurrHeapSize div 1024]); + e_LogWriteFln('cur heap used = %d k', [hs.CurrHeapUsed div 1024]); + e_LogWriteFln('cur heap free = %d k', [hs.CurrHeapFree div 1024]); + e_LogWriteLn ('^=======================^'); +end; procedure DebugCommands(P: SArray); var a, b: Integer; cmd: string; - //pt: TPoint; + //pt: TDFPoint; mon: TMonster; begin // Êîìàíäû îòëàäî÷íîãî ðåæèìà: - if gDebugMode then + if {gDebugMode}conIsCheatsEnabled then begin cmd := LowerCase(P[0]); if cmd = 'd_window' then @@ -5051,18 +5262,19 @@ begin end else if cmd = 'd_monster' then begin - if gGameOn and (gPlayer1 <> nil) and (gPlayer1.Live) and (not g_Game_IsNet) then + if gGameOn and (gPlayer1 <> nil) and (gPlayer1.alive) and (not g_Game_IsNet) then if Length(P) < 2 then begin g_Console_Add(cmd + ' [ID | Name] [behaviour]'); g_Console_Add('ID | Name'); for b := MONSTER_DEMON to MONSTER_MAN do - g_Console_Add(Format('%2d | %s', [b, g_Monsters_GetNameByID(b)])); + g_Console_Add(Format('%2d | %s', [b, g_Mons_NameByTypeId(b)])); + conwriteln('behav. num'#10'normal 0'#10'killer 1'#10'maniac 2'#10'insane 3'#10'cannibal 4'#10'good 5'); end else begin a := StrToIntDef(P[1], 0); if (a < MONSTER_DEMON) or (a > MONSTER_MAN) then - a := g_Monsters_GetIDByName(P[1]); + a := g_Mons_TypeIdByName(P[1]); if (a < MONSTER_DEMON) or (a > MONSTER_MAN) then g_Console_Add(Format(_lc[I_MSG_NO_MONSTER], [P[1]])) @@ -5076,7 +5288,17 @@ begin gPlayer1.Direction, True); end; if (Length(P) > 2) and (mon <> nil) then - mon.MonsterBehaviour := Min(Max(StrToIntDef(P[2], BH_NORMAL), BH_NORMAL), BH_GOOD); + begin + if (CompareText(P[2], 'normal') = 0) then mon.MonsterBehaviour := BH_NORMAL + else if (CompareText(P[2], 'killer') = 0) then mon.MonsterBehaviour := BH_KILLER + else if (CompareText(P[2], 'maniac') = 0) then mon.MonsterBehaviour := BH_MANIAC + else if (CompareText(P[2], 'insane') = 0) then mon.MonsterBehaviour := BH_INSANE + else if (CompareText(P[2], 'cannibal') = 0) then mon.MonsterBehaviour := BH_CANNIBAL + else if (CompareText(P[2], 'good') = 0) then mon.MonsterBehaviour := BH_GOOD + else if (CompareText(P[2], 'friend') = 0) then mon.MonsterBehaviour := BH_GOOD + else if (CompareText(P[2], 'friendly') = 0) then mon.MonsterBehaviour := BH_GOOD + else mon.MonsterBehaviour := Min(Max(StrToIntDef(P[2], BH_NORMAL), BH_NORMAL), BH_GOOD); + end; end; end; end @@ -5100,6 +5322,10 @@ begin begin for a := 1 to 8 do g_Console_Add(e_JoystickStateToString(a)); + end + else if (cmd = 'd_mem') then + begin + PrintHeapStats(); end; end else @@ -5113,8 +5339,7 @@ var f, a: Integer; plr: TPlayer; begin - if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and - (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then + if (not gGameOn) or (not conIsCheatsEnabled) then begin g_Console_Add('not available'); exit; @@ -5152,7 +5377,8 @@ begin begin g_Console_Add('player left the map'); gExitByTrigger := True; - g_Game_ExitLevel(gTriggers[a].Data.MapName); + //g_Game_ExitLevel(gTriggers[a].Data.MapName); + g_Game_ExitLevel(gTriggers[a].tgcMap); break; end; end; @@ -5347,7 +5573,7 @@ begin else if cmd = 'pause' then begin if (g_ActiveWindow = nil) then - g_Game_Pause(not gPause); + g_Game_Pause(not gPauseMain); end else if cmd = 'endgame' then gExit := EXIT_SIMPLE @@ -6021,14 +6247,15 @@ begin if gTriggers[a].TriggerType = TRIGGER_EXIT then begin gExitByTrigger := True; - gNextMap := gTriggers[a].Data.MapName; + //gNextMap := gTriggers[a].Data.MapName; + gNextMap := gTriggers[a].tgcMap; Break; end; // Èùåì ñëåäóþùóþ êàðòó â WAD ôàéëå if gNextMap = '' then gNextMap := g_Game_GetNextMap(); // Ïðîâåðÿåì, íå çàäàí ëè WAD ôàéë ðåñóðñíîé ñòðîêîé - if Pos(':\', gNextMap) = 0 then + if not isWadPath(gNextMap) then s := gGameSettings.WAD + ':\' + gNextMap else s := gNextMap; @@ -6074,6 +6301,21 @@ begin Exit; end; end + else if cmd = 'suicide' then + begin + if gGameOn then + begin + if g_Game_IsClient then + MC_SEND_CheatRequest(NET_CHEAT_SUICIDE) + else + begin + if gPlayer1 <> nil then + gPlayer1.Damage(SUICIDE_DAMAGE, gPlayer1.UID, 0, 0, HIT_SELF); + if gPlayer2 <> nil then + gPlayer2.Damage(SUICIDE_DAMAGE, gPlayer2.UID, 0, 0, HIT_SELF); + end; + end; + end // Êîìàíäû Ñâîåé èãðû: else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then begin @@ -6091,21 +6333,6 @@ begin else g_Bot_Add(TEAM_BLUE, 2); end - else if cmd = 'suicide' then - begin - if gGameOn then - begin - if g_Game_IsClient then - MC_SEND_CheatRequest(NET_CHEAT_SUICIDE) - else - begin - if gPlayer1 <> nil then - gPlayer1.Damage(SUICIDE_DAMAGE, gPlayer1.UID, 0, 0, HIT_SELF); - if gPlayer2 <> nil then - gPlayer2.Damage(SUICIDE_DAMAGE, gPlayer2.UID, 0, 0, HIT_SELF); - end; - end; - end else if cmd = 'spectate' then begin if not gGameOn then @@ -6344,19 +6571,31 @@ begin end; end; -procedure g_Game_Pause(Enable: Boolean); +procedure g_Game_Pause (Enable: Boolean); +var + oldPause: Boolean; begin - if not gGameOn then - Exit; + if not gGameOn then exit; - if gPause = Enable then - Exit; + if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit; - if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then - Exit; + oldPause := gPause; + gPauseMain := Enable; + + if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause); +end; + +procedure g_Game_HolmesPause (Enable: Boolean); +var + oldPause: Boolean; +begin + if not gGameOn then exit; + if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit; + + oldPause := gPause; + gPauseHolmes := Enable; - gPause := Enable; - g_Game_PauseAllSounds(Enable); + if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause); end; procedure g_Game_PauseAllSounds(Enable: Boolean); @@ -6412,17 +6651,17 @@ begin with gTriggers[i] do if (TriggerType = TRIGGER_SOUND) and (Sound <> nil) and - (Data.Local) and + (tgcLocal) and Sound.IsPlaying() then begin if ((gPlayer1 <> nil) and g_CollidePoint(gPlayer1.GameX, gPlayer1.GameY, X, Y, Width, Height)) or ((gPlayer2 <> nil) and g_CollidePoint(gPlayer2.GameX, gPlayer2.GameY, X, Y, Width, Height)) then begin - Sound.SetPan(0.5 - Data.Pan/255.0); - Sound.SetVolume(Data.Volume/255.0); + Sound.SetPan(0.5 - tgcPan/255.0); + Sound.SetVolume(tgcVolume/255.0); end else - Sound.SetCoords(X+(Width div 2), Y+(Height div 2), Data.Volume/255.0); + Sound.SetCoords(X+(Width div 2), Y+(Height div 2), tgcVolume/255.0); end; end; @@ -6710,7 +6949,7 @@ begin g_ActiveWindow := nil; - ProcessLoading; + ProcessLoading(true); end; procedure g_Game_StepLoading(); @@ -6722,7 +6961,7 @@ begin if (ShowCount > LOADING_SHOW_STEP) then begin ShowCount := 0; - ProcessLoading; + ProcessLoading(); end; end; end; @@ -6929,7 +7168,7 @@ begin s := Find_Param_Value(pars, '-exec'); if s <> '' then begin - if Pos(':\', s) = 0 then + if not isWadPath(s) then s := GameDir + '/' + s; {$I-} @@ -6984,4 +7223,9 @@ begin conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true); conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true); + + conRegVar('dbg_scale', @g_dbg_scale, 0.01, 100.0, 'experimental deBUG scale mode', '', false); + + conRegVar('light_enabled', @gwin_k8_enable_light_experiments, 'enable/disable dynamic lighting', 'lighting'); + conRegVar('light_player_halo', @g_playerLight, 'enable/disable player halo', 'player light halo'); end.