X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=cc4072825e29eef423be9edf61c66c02b9e6eb44;hb=02aa579297ce5b8e70659aacf1b9ab505edc7aaa;hp=e65dc764ae52fd0ec5d1a9eb2251f58b89bb08d4;hpb=56fe3537337bec115cae2b73922752488ff298a4;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index e65dc76..cc40728 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -1,10 +1,26 @@ +(* Copyright (C) DooM 2D:Forever Developers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) +{$MODE DELPHI} unit g_game; interface uses g_basic, g_player, e_graphics, Classes, g_res_downloader, - SysUtils, g_sound, g_gui, MAPSTRUCT, WADEDITOR, md5; + SysUtils, g_sound, g_gui, g_scripts, MAPSTRUCT, wadreader, md5; type TGameSettings = record @@ -470,7 +486,7 @@ end; function g_Game_GetMegaWADInfo(WAD: String): TMegaWADInfo; var - w: TWADEditor_1; + w: TWADFile; cfg: TConfig; p: Pointer; len: Integer; @@ -479,10 +495,10 @@ begin Result.description := ''; Result.author := ''; - w := TWADEditor_1.Create(); + w := TWADFile.Create(); w.ReadFile(WAD); - if not w.GetResource('', 'INTERSCRIPT', p, len) then + if not w.GetResource('INTERSCRIPT', p, len) then begin w.Free(); Exit; @@ -525,7 +541,7 @@ end; procedure g_Game_LoadWAD(WAD: string); var - w: TWADEditor_1; + w: TWADFile; cfg: TConfig; p: Pointer; {b, }len: Integer; @@ -538,10 +554,10 @@ begin MegaWAD.info := g_Game_GetMegaWADInfo(MapsDir + WAD); - w := TWADEditor_1.Create(); + w := TWADFile.Create(); w.ReadFile(MapsDir + WAD); - if not w.GetResource('', 'INTERSCRIPT', p, len) then + if not w.GetResource('INTERSCRIPT', p, len) then begin w.Free(); Exit; @@ -578,14 +594,14 @@ begin MegaWAD.endpic := cfg.ReadStr('megawad', 'endpic', ''); if MegaWAD.endpic <> '' then begin - g_ProcessResourceStr(MegaWAD.endpic, @s, nil, nil); + s := g_ExtractWadName(MegaWAD.endpic); if s = '' then s := MapsDir+WAD else s := GameDir+'/wads/'; g_Texture_CreateWADEx('TEXTURE_endpic', s+MegaWAD.endpic); end; MegaWAD.endmus := cfg.ReadStr('megawad', 'endmus', 'Standart.wad:D2DMUS\ÊÎÍÅÖ'); if MegaWAD.endmus <> '' then begin - g_ProcessResourceStr(MegaWAD.endmus, @s, nil, nil); + s := g_ExtractWadName(MegaWAD.endmus); if s = '' then s := MapsDir+WAD else s := GameDir+'/wads/'; g_Sound_CreateWADEx('MUSIC_endmus', s+MegaWAD.endmus, True); end; @@ -663,7 +679,7 @@ end; procedure EndGame(); var a: Integer; - FileName, SectionName, ResName: string; + FileName: string; begin if g_Game_IsNet and g_Game_IsServer then MH_SEND_GameEvent(NET_EV_MAPEND, Byte(gMissionFailed)); @@ -725,10 +741,10 @@ begin EXIT_ENDLEVELCUSTOM: // Çàêîí÷èëñÿ óðîâåíü â Ñâîåé èãðå begin // Ñòàòèñòèêà Ñâîåé èãðû: - g_ProcessResourceStr(gMapInfo.Map, FileName, SectionName, ResName); + FileName := g_ExtractWadName(gMapInfo.Map); CustomStat.GameTime := gTime; - CustomStat.Map := ExtractFileName(FileName)+':'+ResName; + CustomStat.Map := ExtractFileName(FileName)+':'+g_ExtractFileName(gMapInfo.Map); //ResName; CustomStat.MapName := gMapInfo.Name; CustomStat.GameMode := gGameSettings.GameMode; if gGameSettings.GameMode in [GM_TDM, GM_CTF] then @@ -840,8 +856,8 @@ begin e_DrawFillQuad(x, y, x+w-1, y+h-1, 64, 64, 64, 32); e_DrawQuad(x, y, x+w-1, y+h-1, 255, 127, 0); - g_ProcessResourceStr(gMapInfo.Map, @wad, nil, @map); - wad := ExtractFileName(wad); + wad := g_ExtractWadNameNoPath(gMapInfo.Map); + map := g_ExtractFileName(gMapInfo.Map); mapstr := wad + ':\' + map + ' - ' + gMapInfo.Name; case gGameSettings.GameMode of @@ -1082,6 +1098,9 @@ begin g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False); g_Menu_Init(); + + g_Scripts_Init(); + g_Scripts_Load('game.conprint("Scripts Init")'); gMusic := TMusic.Create(); gMusic.SetByName('MUSIC_MENU'); @@ -1200,6 +1219,13 @@ begin Result := ids[(Length(ids) - 1 + idx) mod Length(ids)]; end; +function isKeyPressed (key1: Word; key2: Word): Boolean; +begin + if (key1 <> 0) and e_KeyPressed(key1) then begin result := true; exit; end; + if (key2 <> 0) and e_KeyPressed(key2) then begin result := true; exit; end; + result := false; +end; + procedure g_Game_Update(); var Msg: g_gui.TMessage; @@ -1443,13 +1469,13 @@ begin if gPlayer1 <> nil then with gGameControls.P1Control do begin - if e_KeyPressed(KeyLeft) and (not e_KeyPressed(KeyRight)) then + if isKeyPressed(KeyLeft, KeyLeft2) and (not isKeyPressed(KeyRight, KeyRight2)) then P1MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî" else - if (not e_KeyPressed(KeyLeft)) and e_KeyPressed(KeyRight) then + if (not isKeyPressed(KeyLeft, KeyLeft2)) and isKeyPressed(KeyRight, KeyRight2) then P1MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî" else - if (not e_KeyPressed(KeyLeft)) and (not e_KeyPressed(KeyRight)) then + if (not isKeyPressed(KeyLeft, KeyLeft2)) and (not isKeyPressed(KeyRight, KeyRight2)) then P1MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî" // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó: @@ -1460,11 +1486,11 @@ begin gPlayer1.PressKey(KEY_RIGHT); // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî: - if (P1MoveButton = 2) and e_KeyPressed(KeyLeft) then + if (P1MoveButton = 2) and isKeyPressed(KeyLeft, KeyLeft2) then gPlayer1.SetDirection(D_LEFT) else // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî: - if (P1MoveButton = 1) and e_KeyPressed(KeyRight) then + if (P1MoveButton = 1) and isKeyPressed(KeyRight, KeyRight2) then gPlayer1.SetDirection(D_RIGHT) else // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì: @@ -1472,25 +1498,25 @@ begin gPlayer1.SetDirection(TDirection(P1MoveButton-1)); // Îñòàëüíûå êëàâèøè: - if e_KeyPressed(KeyJump) then gPlayer1.PressKey(KEY_JUMP); - if e_KeyPressed(KeyUp) then gPlayer1.PressKey(KEY_UP); - if e_KeyPressed(KeyDown) then gPlayer1.PressKey(KEY_DOWN); - if e_KeyPressed(KeyFire) then gPlayer1.PressKey(KEY_FIRE); - if e_KeyPressed(KeyNextWeapon) then gPlayer1.PressKey(KEY_NEXTWEAPON); - if e_KeyPressed(KeyPrevWeapon) then gPlayer1.PressKey(KEY_PREVWEAPON); - if e_KeyPressed(KeyOpen) then gPlayer1.PressKey(KEY_OPEN); + if isKeyPressed(KeyJump, KeyJump2) then gPlayer1.PressKey(KEY_JUMP); + if isKeyPressed(KeyUp, KeyUp2) then gPlayer1.PressKey(KEY_UP); + if isKeyPressed(KeyDown, KeyDown2) then gPlayer1.PressKey(KEY_DOWN); + if isKeyPressed(KeyFire, KeyFire2) then gPlayer1.PressKey(KEY_FIRE); + if isKeyPressed(KeyNextWeapon, KeyNextWeapon2) then gPlayer1.PressKey(KEY_NEXTWEAPON); + if isKeyPressed(KeyPrevWeapon, KeyPrevWeapon2) then gPlayer1.PressKey(KEY_PREVWEAPON); + if isKeyPressed(KeyOpen, KeyOpen2) then gPlayer1.PressKey(KEY_OPEN); end; // Âòîðîé èãðîê: if gPlayer2 <> nil then with gGameControls.P2Control do begin - if e_KeyPressed(KeyLeft) and (not e_KeyPressed(KeyRight)) then + if isKeyPressed(KeyLeft, KeyLeft2) and (not isKeyPressed(KeyRight, KeyRight2)) then P2MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî" else - if (not e_KeyPressed(KeyLeft)) and e_KeyPressed(KeyRight) then + if (not isKeyPressed(KeyLeft, KeyLeft2)) and isKeyPressed(KeyRight, KeyRight2) then P2MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî" else - if (not e_KeyPressed(KeyLeft)) and (not e_KeyPressed(KeyRight)) then + if (not isKeyPressed(KeyLeft, KeyLeft2)) and (not isKeyPressed(KeyRight, KeyRight2)) then P2MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî" // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó: @@ -1501,11 +1527,11 @@ begin gPlayer2.PressKey(KEY_RIGHT, 1000); // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî: - if (P2MoveButton = 2) and e_KeyPressed(KeyLeft) then + if (P2MoveButton = 2) and isKeyPressed(KeyLeft, KeyLeft2) then gPlayer2.SetDirection(D_LEFT) else // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî: - if (P2MoveButton = 1) and e_KeyPressed(KeyRight) then + if (P2MoveButton = 1) and isKeyPressed(KeyRight, KeyRight2) then gPlayer2.SetDirection(D_RIGHT) else // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì: @@ -1513,13 +1539,13 @@ begin gPlayer2.SetDirection(TDirection(P2MoveButton-1)); // Îñòàëüíûå êëàâèøè: - if e_KeyPressed(KeyJump) then gPlayer2.PressKey(KEY_JUMP, 1000); - if e_KeyPressed(KeyUp) then gPlayer2.PressKey(KEY_UP, 1000); - if e_KeyPressed(KeyDown) then gPlayer2.PressKey(KEY_DOWN, 1000); - if e_KeyPressed(KeyFire) then gPlayer2.PressKey(KEY_FIRE); - if e_KeyPressed(KeyNextWeapon) then gPlayer2.PressKey(KEY_NEXTWEAPON); - if e_KeyPressed(KeyPrevWeapon) then gPlayer2.PressKey(KEY_PREVWEAPON); - if e_KeyPressed(KeyOpen) then gPlayer2.PressKey(KEY_OPEN); + if isKeyPressed(KeyJump, KeyJump2) then gPlayer2.PressKey(KEY_JUMP, 1000); + if isKeyPressed(KeyUp, KeyUp2) then gPlayer2.PressKey(KEY_UP, 1000); + if isKeyPressed(KeyDown, KeyDown2) then gPlayer2.PressKey(KEY_DOWN, 1000); + if isKeyPressed(KeyFire, KeyFire2) then gPlayer2.PressKey(KEY_FIRE); + if isKeyPressed(KeyNextWeapon, KeyNextWeapon2) then gPlayer2.PressKey(KEY_NEXTWEAPON); + if isKeyPressed(KeyPrevWeapon, KeyPrevWeapon2) then gPlayer2.PressKey(KEY_PREVWEAPON); + if isKeyPressed(KeyOpen, KeyOpen2) then gPlayer2.PressKey(KEY_OPEN); end; end // if not console else @@ -1534,7 +1560,7 @@ begin begin if not gSpectKeyPress then begin - if e_KeyPressed(gGameControls.P1Control.KeyJump) then + if isKeyPressed(gGameControls.P1Control.KeyJump, gGameControls.P1Control.KeyJump2) then begin // switch spect mode case gSpectMode of @@ -1547,21 +1573,21 @@ begin end; if gSpectMode = SPECT_MAPVIEW then begin - if e_KeyPressed(gGameControls.P1Control.KeyLeft) then + if isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2) then gSpectX := Max(gSpectX - gSpectStep, 0); - if e_KeyPressed(gGameControls.P1Control.KeyRight) then + if isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2) then gSpectX := Min(gSpectX + gSpectStep, gMapInfo.Width - gScreenWidth); - if e_KeyPressed(gGameControls.P1Control.KeyUp) then + if isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2) then gSpectY := Max(gSpectY - gSpectStep, 0); - if e_KeyPressed(gGameControls.P1Control.KeyDown) then + if isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2) then gSpectY := Min(gSpectY + gSpectStep, gMapInfo.Height - gScreenHeight); - if e_KeyPressed(gGameControls.P1Control.KeyPrevWeapon) then + if isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2) then begin // decrease step if gSpectStep > 4 then gSpectStep := gSpectStep shr 1; gSpectKeyPress := True; end; - if e_KeyPressed(gGameControls.P1Control.KeyNextWeapon) then + if isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2) then begin // increase step if gSpectStep < 64 then gSpectStep := gSpectStep shl 1; @@ -1570,37 +1596,37 @@ begin end; if gSpectMode = SPECT_PLAYERS then begin - if e_KeyPressed(gGameControls.P1Control.KeyUp) then + if isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2) then begin // add second view gSpectViewTwo := True; gSpectKeyPress := True; end; - if e_KeyPressed(gGameControls.P1Control.KeyDown) then + if isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2) then begin // remove second view gSpectViewTwo := False; gSpectKeyPress := True; end; - if e_KeyPressed(gGameControls.P1Control.KeyLeft) then + if isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2) then begin // prev player (view 1) gSpectPID1 := GetActivePlayerID_Prev(gSpectPID1); gSpectKeyPress := True; end; - if e_KeyPressed(gGameControls.P1Control.KeyRight) then + if isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2) then begin // next player (view 1) gSpectPID1 := GetActivePlayerID_Next(gSpectPID1); gSpectKeyPress := True; end; - if e_KeyPressed(gGameControls.P1Control.KeyPrevWeapon) then + if isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2) then begin // prev player (view 2) gSpectPID2 := GetActivePlayerID_Prev(gSpectPID2); gSpectKeyPress := True; end; - if e_KeyPressed(gGameControls.P1Control.KeyNextWeapon) then + if isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2) then begin // next player (view 2) gSpectPID2 := GetActivePlayerID_Next(gSpectPID2); @@ -1609,13 +1635,13 @@ begin end; end else - if (not e_KeyPressed(gGameControls.P1Control.KeyJump)) and - (not e_KeyPressed(gGameControls.P1Control.KeyLeft)) and - (not e_KeyPressed(gGameControls.P1Control.KeyRight)) and - (not e_KeyPressed(gGameControls.P1Control.KeyUp)) and - (not e_KeyPressed(gGameControls.P1Control.KeyDown)) and - (not e_KeyPressed(gGameControls.P1Control.KeyPrevWeapon)) and - (not e_KeyPressed(gGameControls.P1Control.KeyNextWeapon)) then + if (not isKeyPressed(gGameControls.P1Control.KeyJump, gGameControls.P1Control.KeyJump2)) and + (not isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2)) and + (not isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2)) and + (not isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2)) and + (not isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2)) and + (not isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2)) and + (not isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2)) then gSpectKeyPress := False; end; @@ -3661,7 +3687,7 @@ var begin if g_Game_IsClient then Exit; - g_ProcessResourceStr(gMapInfo.Map, nil, nil, @Map); + map := g_ExtractFileName(gMapInfo.Map); MessageTime := 0; gGameOn := False; @@ -3692,7 +3718,8 @@ begin if Pos(':\', Map) > 0 then begin - g_ProcessResourceStr(Map, @NewWAD, nil, @ResName); + NewWAD := g_ExtractWadName(Map); + ResName := g_ExtractFileName(Map); if g_Game_IsServer then begin gWADHash := MD5File(MapsDir + NewWAD); @@ -3870,7 +3897,7 @@ begin Exit; end; gExit := EXIT_ENDLEVELCUSTOM; - g_ProcessResourceStr(gMapInfo.Map, nil, nil, @Map); + Map := g_ExtractFileName(gMapInfo.Map); gNextMap := Map; end; @@ -4018,7 +4045,7 @@ begin if MapList = nil then Exit; - g_ProcessResourceStr(gMapInfo.Map, nil, nil, @Map); + Map := g_ExtractFileName(gMapInfo.Map); SortSArray(MapList); MapIndex := -255; @@ -4057,11 +4084,8 @@ begin end; function g_Game_IsTestMap(): Boolean; -var - FName, Sect, Res: String; begin - g_ProcessResourceStr(gMapInfo.Map, FName, Sect, Res); - Result := UpperCase(Res) = TEST_MAP_NAME; + result := StrEquCI1251(TEST_MAP_NAME, g_ExtractFileName(gMapInfo.Map)); end; procedure g_Game_DeleteTestMap(); @@ -4070,7 +4094,7 @@ var MapName: Char16; WadName: string; { - WAD: TWADEditor_1; + WAD: TWADFile; MapList: SArray; time: Integer; } @@ -4094,7 +4118,7 @@ begin if not gTempDelete then begin time := g_GetFileTime(WadName); - WAD := TWADEditor_1.Create(); + WAD := TWADFile.Create(); // ×èòàåì Wad-ôàéë: if not WAD.ReadFile(WadName) then @@ -5851,17 +5875,43 @@ end; procedure g_TakeScreenShot(); var a: Word; - FileName: String; + FileName: string; + ssdir, t: string; + st: TStream; + ok: Boolean; begin - for a := 1 to High(Word) do - begin - FileName := Format(GameDir+'/screenshots/screenshot%.3d.bmp', [a]); - if not FileExists(FileName) then + if e_NoGraphics then Exit; + ssdir := GameDir+'/screenshots'; + if not findFileCI(ssdir, true) then + begin + // try to create dir + try + CreateDir(ssdir); + except + end; + if not findFileCI(ssdir, true) then exit; // alas + end; + try + for a := 1 to High(Word) do begin - e_MakeScreenshot(FileName, gScreenWidth, gScreenHeight); - g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [ExtractFileName(FileName)])); - Break; + FileName := Format(ssdir+'screenshot%.3d.png', [a]); + t := FileName; + if findFileCI(t, true) then continue; + if not findFileCI(FileName) then + begin + ok := false; + st := createDiskFile(FileName); + try + e_MakeScreenshot(st, gScreenWidth, gScreenHeight); + ok := true; + finally + st.Free(); + end; + if not ok then try DeleteFile(FileName); except end else g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [ExtractFileName(FileName)])); + break; + end; end; + except end; end;