X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=baf0f630cdbe3414543ba7107537817dbd33e31c;hb=4cd716955ad8f4e1c883f924b827c3244cee4af6;hp=265533e11fa49a7f094e3438865f55deb36975ee;hpb=e06da872a0a072eea1117350ed6c14a709328807;p=d2df-sdl.git
diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 265533e..baf0f63 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
@@ -106,6 +122,7 @@ function g_Game_IsTestMap(): Boolean;
procedure g_Game_DeleteTestMap();
procedure GameCVars(P: SArray);
procedure GameCommands(P: SArray);
+procedure GameCheats(P: SArray);
procedure DebugCommands(P: SArray);
procedure g_Game_Process_Params;
procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean);
@@ -244,7 +261,7 @@ var
gWinPosX, gWinPosY: Integer;
gWinSizeX, gWinSizeY: Integer;
gWinFrameX, gWinFrameY, gWinCaption: Integer;
- gWinActive: Boolean = False;
+ gWinActive: Boolean = True; // by default window is active, lol
gResolutionChange: Boolean = False;
gRC_Width, gRC_Height: Word;
gRC_FullScreen, gRC_Maximized: Boolean;
@@ -294,7 +311,8 @@ uses
g_playermodel, g_gfx, g_options, g_weapons, Math,
g_triggers, MAPDEF, g_monsters, e_sound, CONFIG,
BinEditor, g_language, g_net, SDL,
- ENet, e_fixedbuffer, g_netmsg, g_netmaster, GL, GLExt;
+ ENet, e_fixedbuffer, g_netmsg, g_netmaster, GL, GLExt,
+ utils, sfs;
type
TEndCustomGameStat = record
@@ -468,7 +486,7 @@ end;
function g_Game_GetMegaWADInfo(WAD: String): TMegaWADInfo;
var
- w: TWADEditor_1;
+ w: TWADFile;
cfg: TConfig;
p: Pointer;
len: Integer;
@@ -477,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;
@@ -523,7 +541,7 @@ end;
procedure g_Game_LoadWAD(WAD: string);
var
- w: TWADEditor_1;
+ w: TWADFile;
cfg: TConfig;
p: Pointer;
{b, }len: Integer;
@@ -536,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;
@@ -576,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;
@@ -652,7 +670,7 @@ begin
gDelayedEvents[n].DENum := Num;
gDelayedEvents[n].DEStr := Str;
if DEType = DE_GLOBEVENT then
- gDelayedEvents[n].Time := (GetTimer() div 1000) + Time
+ gDelayedEvents[n].Time := (GetTimer() {div 1000}) + Time
else
gDelayedEvents[n].Time := gTime + Time;
Result := n;
@@ -661,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));
@@ -723,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
@@ -838,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
@@ -1019,66 +1037,89 @@ begin
gMapToDelete := '';
gTempDelete := False;
- g_Texture_CreateWADEx('MENU_BACKGROUND', GameWAD+':TEXTURES\TITLE');
- g_Texture_CreateWADEx('INTER', GameWAD+':TEXTURES\INTER');
- g_Texture_CreateWADEx('ENDGAME_EN', GameWAD+':TEXTURES\ENDGAME_EN');
- g_Texture_CreateWADEx('ENDGAME_RU', GameWAD+':TEXTURES\ENDGAME_RU');
-
- LoadStdFont('STDTXT', 'STDFONT', gStdFont);
- LoadFont('MENUTXT', 'MENUFONT', gMenuFont);
- LoadFont('SMALLTXT', 'SMALLFONT', gMenuSmallFont);
-
- g_Game_ClearLoading();
- g_Game_SetLoadingText(Format('Doom 2D: Forever %s', [GAME_VERSION]), 0, False);
- g_Game_SetLoadingText('', 0, False);
-
- g_Game_SetLoadingText(_lc[I_LOAD_CONSOLE], 0, False);
- g_Console_Init();
-
- g_Game_SetLoadingText(_lc[I_LOAD_MODELS], 0, False);
- g_PlayerModel_LoadData();
-
- if FindFirst(ModelsDir+'*.wad', faAnyFile, SR) = 0 then
- repeat
- if not g_PlayerModel_Load(ModelsDir+SR.Name) then
- e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
- until FindNext(SR) <> 0;
- FindClose(SR);
-
- gGameOn := False;
- gPause := False;
- gTime := 0;
- LastScreenShot := 0;
-
- {e_MouseInfo.Accel := 1.0;}
-
- g_Game_SetLoadingText(_lc[I_LOAD_GAME_DATA], 0, False);
- g_Game_LoadData();
-
- g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
- g_Sound_CreateWADEx('MUSIC_INTERMUS', GameWAD+':MUSIC\INTERMUS', True);
- g_Sound_CreateWADEx('MUSIC_MENU', GameWAD+':MUSIC\MENU', True);
- g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS');
- g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
-
- g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);
- g_Menu_Init();
-
- gMusic := TMusic.Create();
- gMusic.SetByName('MUSIC_MENU');
- gMusic.Play();
-
- gGameSettings.WarmupTime := 30;
-
- gState := STATE_MENU;
-
- SetLength(gEvents, 6);
- gEvents[0].Name := 'ongamestart';
- gEvents[1].Name := 'ongameend';
- gEvents[2].Name := 'onmapstart';
- gEvents[3].Name := 'onmapend';
- gEvents[4].Name := 'oninter';
- gEvents[5].Name := 'onwadend';
+ sfsGCDisable(); // temporary disable removing of temporary volumes
+
+ try
+ g_Texture_CreateWADEx('MENU_BACKGROUND', GameWAD+':TEXTURES\TITLE');
+ g_Texture_CreateWADEx('INTER', GameWAD+':TEXTURES\INTER');
+ g_Texture_CreateWADEx('ENDGAME_EN', GameWAD+':TEXTURES\ENDGAME_EN');
+ g_Texture_CreateWADEx('ENDGAME_RU', GameWAD+':TEXTURES\ENDGAME_RU');
+
+ LoadStdFont('STDTXT', 'STDFONT', gStdFont);
+ LoadFont('MENUTXT', 'MENUFONT', gMenuFont);
+ LoadFont('SMALLTXT', 'SMALLFONT', gMenuSmallFont);
+
+ g_Game_ClearLoading();
+ g_Game_SetLoadingText(Format('Doom 2D: Forever %s', [GAME_VERSION]), 0, False);
+ g_Game_SetLoadingText('', 0, False);
+
+ g_Game_SetLoadingText(_lc[I_LOAD_CONSOLE], 0, False);
+ g_Console_Init();
+
+ g_Game_SetLoadingText(_lc[I_LOAD_MODELS], 0, False);
+ g_PlayerModel_LoadData();
+
+ if FindFirst(ModelsDir+'*.wad', faAnyFile, SR) = 0 then
+ repeat
+ if not g_PlayerModel_Load(ModelsDir+SR.Name) then
+ e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
+ until FindNext(SR) <> 0;
+ FindClose(SR);
+
+ if FindFirst(ModelsDir+'*.pk3', faAnyFile, SR) = 0 then
+ repeat
+ if not g_PlayerModel_Load(ModelsDir+SR.Name) then
+ e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
+ until FindNext(SR) <> 0;
+ FindClose(SR);
+
+ if FindFirst(ModelsDir+'*.zip', faAnyFile, SR) = 0 then
+ repeat
+ if not g_PlayerModel_Load(ModelsDir+SR.Name) then
+ e_WriteLog(Format('Error loading model %s', [SR.Name]), MSG_WARNING);
+ until FindNext(SR) <> 0;
+ FindClose(SR);
+
+ gGameOn := False;
+ gPause := False;
+ gTime := 0;
+ LastScreenShot := 0;
+
+ {e_MouseInfo.Accel := 1.0;}
+
+ g_Game_SetLoadingText(_lc[I_LOAD_GAME_DATA], 0, False);
+ g_Game_LoadData();
+
+ g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
+ g_Sound_CreateWADEx('MUSIC_INTERMUS', GameWAD+':MUSIC\INTERMUS', True);
+ g_Sound_CreateWADEx('MUSIC_MENU', GameWAD+':MUSIC\MENU', True);
+ g_Sound_CreateWADEx('MUSIC_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True);
+ g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
+
+ 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');
+ gMusic.Play();
+
+ gGameSettings.WarmupTime := 30;
+
+ gState := STATE_MENU;
+
+ SetLength(gEvents, 6);
+ gEvents[0].Name := 'ongamestart';
+ gEvents[1].Name := 'ongameend';
+ gEvents[2].Name := 'onmapstart';
+ gEvents[3].Name := 'onmapend';
+ gEvents[4].Name := 'oninter';
+ gEvents[5].Name := 'onwadend';
+ finally
+ sfsGCEnable(); // enable releasing unused volumes
+ end;
end;
procedure g_Game_Free();
@@ -1178,6 +1219,47 @@ 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 processPlayerControls (plr: TPlayer; var ctrl: TPlayerControl; var MoveButton: Byte; p2hack: Boolean=false);
+var
+ time: Word;
+begin
+ if (plr = nil) then exit;
+ if (p2hack) then time := 1000 else time := 1;
+ with ctrl do
+ begin
+ if isKeyPressed(KeyLeft, KeyLeft2) and (not isKeyPressed(KeyRight, KeyRight2)) then MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî"
+ else if (not isKeyPressed(KeyLeft, KeyLeft2)) and isKeyPressed(KeyRight, KeyRight2) then MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî"
+ else if (not isKeyPressed(KeyLeft, KeyLeft2)) and (not isKeyPressed(KeyRight, KeyRight2)) then MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî"
+
+ // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó:
+ if MoveButton = 1 then plr.PressKey(KEY_LEFT, time)
+ else if MoveButton = 2 then plr.PressKey(KEY_RIGHT, time);
+
+ // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî:
+ if (MoveButton = 2) and isKeyPressed(KeyLeft, KeyLeft2) then plr.SetDirection(D_LEFT)
+ // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî:
+ else if (MoveButton = 1) and isKeyPressed(KeyRight, KeyRight2) then plr.SetDirection(D_RIGHT)
+ // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì:
+ else if MoveButton <> 0 then plr.SetDirection(TDirection(MoveButton-1));
+
+ // Îñòàëüíûå êëàâèøè:
+ if isKeyPressed(KeyJump, KeyJump2) then plr.PressKey(KEY_JUMP, time);
+ if isKeyPressed(KeyUp, KeyUp2) then plr.PressKey(KEY_UP, time);
+ if isKeyPressed(KeyDown, KeyDown2) then plr.PressKey(KEY_DOWN, time);
+ if isKeyPressed(KeyFire, KeyFire2) then plr.PressKey(KEY_FIRE);
+ if isKeyPressed(KeyNextWeapon, KeyNextWeapon2) then plr.PressKey(KEY_NEXTWEAPON);
+ if isKeyPressed(KeyPrevWeapon, KeyPrevWeapon2) then plr.PressKey(KEY_PREVWEAPON);
+ if isKeyPressed(KeyOpen, KeyOpen2) then plr.PressKey(KEY_OPEN);
+ end;
+end;
+
procedure g_Game_Update();
var
Msg: g_gui.TMessage;
@@ -1417,93 +1499,13 @@ begin
if gPlayer2 <> nil then gPlayer2.ReleaseKeys();
if (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
begin
- // Ïåðâûé èãðîê:
- if gPlayer1 <> nil then
- with gGameControls.P1Control do
- begin
- if e_KeyPressed(KeyLeft) and (not e_KeyPressed(KeyRight)) then
- P1MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî"
- else
- if (not e_KeyPressed(KeyLeft)) and e_KeyPressed(KeyRight) then
- P1MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî"
- else
- if (not e_KeyPressed(KeyLeft)) and (not e_KeyPressed(KeyRight)) then
- P1MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî"
-
- // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó:
- if P1MoveButton = 1 then
- gPlayer1.PressKey(KEY_LEFT)
- else
- if P1MoveButton = 2 then
- gPlayer1.PressKey(KEY_RIGHT);
-
- // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî:
- if (P1MoveButton = 2) and e_KeyPressed(KeyLeft) then
- gPlayer1.SetDirection(D_LEFT)
- else
- // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî:
- if (P1MoveButton = 1) and e_KeyPressed(KeyRight) then
- gPlayer1.SetDirection(D_RIGHT)
- else
- // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì:
- if P1MoveButton <> 0 then
- 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);
- end;
- // Âòîðîé èãðîê:
- if gPlayer2 <> nil then
- with gGameControls.P2Control do
- begin
- if e_KeyPressed(KeyLeft) and (not e_KeyPressed(KeyRight)) then
- P2MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî"
- else
- if (not e_KeyPressed(KeyLeft)) and e_KeyPressed(KeyRight) then
- P2MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî"
- else
- if (not e_KeyPressed(KeyLeft)) and (not e_KeyPressed(KeyRight)) then
- P2MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî"
-
- // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó:
- if P2MoveButton = 1 then
- gPlayer2.PressKey(KEY_LEFT, 1000)
- else
- if P2MoveButton = 2 then
- gPlayer2.PressKey(KEY_RIGHT, 1000);
-
- // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî:
- if (P2MoveButton = 2) and e_KeyPressed(KeyLeft) then
- gPlayer2.SetDirection(D_LEFT)
- else
- // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî:
- if (P2MoveButton = 1) and e_KeyPressed(KeyRight) then
- gPlayer2.SetDirection(D_RIGHT)
- else
- // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì:
- if P2MoveButton <> 0 then
- 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);
- end;
+ processPlayerControls(gPlayer1, gGameControls.P1Control, P1MoveButton);
+ processPlayerControls(gPlayer2, gGameControls.P2Control, P2MoveButton, true);
end // if not console
else
- if g_Game_IsNet and (gPlayer1 <> nil) then
- gPlayer1.PressKey(KEY_CHAT, 10000);
-
+ begin
+ if g_Game_IsNet and (gPlayer1 <> nil) then gPlayer1.PressKey(KEY_CHAT, 10000);
+ end;
end; // if server
// Íàáëþäàòåëü
@@ -1512,7 +1514,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
@@ -1525,21 +1527,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;
@@ -1548,37 +1550,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);
@@ -1587,13 +1589,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;
@@ -1732,7 +1734,7 @@ begin
// Äåëàåì ñêðèíøîò (íå ÷àùå 200 ìèëëèñåêóíä):
if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) then
- if (GetTimer()-LastScreenShot) > 200000 then
+ if (GetTimer()-LastScreenShot) > 200000 div 1000 then
begin
g_TakeScreenShot();
LastScreenShot := GetTimer();
@@ -1747,7 +1749,7 @@ begin
KeyPress(IK_F10);
end;
- Time := GetTimer() div 1000;
+ Time := GetTimer() {div 1000};
// Îáðàáîòêà îòëîæåííûõ ñîáûòèé:
if gDelayedEvents <> nil then
@@ -2272,7 +2274,7 @@ begin
end;
end;
-procedure DrawMinimap(p: TPlayer; RenderRect: TRect);
+procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
var
a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;
begin
@@ -2645,8 +2647,7 @@ begin
p.DrawPain();
p.DrawPickup();
p.DrawRulez();
- //if gShowMap then
- //DrawMinimap(p, _TRect(0, 0, 128, 128));
+ if gShowMap then DrawMinimap(p, _TRect(0, 0, 128, 128));
if g_Debug_Player then
g_Player_DrawDebug(p);
p.DrawGUI();
@@ -2664,7 +2665,7 @@ var
begin
if gExit = EXIT_QUIT then Exit;
- Time := GetTimer() div 1000;
+ Time := GetTimer() {div 1000};
FPSCounter := FPSCounter+1;
if Time - FPSTime >= 1000 then
begin
@@ -3640,7 +3641,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;
@@ -3671,7 +3672,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);
@@ -3849,7 +3851,7 @@ begin
Exit;
end;
gExit := EXIT_ENDLEVELCUSTOM;
- g_ProcessResourceStr(gMapInfo.Map, nil, nil, @Map);
+ Map := g_ExtractFileName(gMapInfo.Map);
gNextMap := Map;
end;
@@ -3997,7 +3999,7 @@ begin
if MapList = nil then
Exit;
- g_ProcessResourceStr(gMapInfo.Map, nil, nil, @Map);
+ Map := g_ExtractFileName(gMapInfo.Map);
SortSArray(MapList);
MapIndex := -255;
@@ -4036,20 +4038,20 @@ 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();
var
- WAD: TWADEditor_1;
+ a: Integer;
MapName: Char16;
- MapList: SArray;
- a, time: Integer;
WadName: string;
+{
+ WAD: TWADFile;
+ MapList: SArray;
+ time: Integer;
+}
begin
a := Pos('.wad:\', gMapToDelete);
if a = 0 then
@@ -4062,6 +4064,7 @@ begin
MapName := '';
CopyMemory(@MapName[0], @gMapToDelete[1], Min(16, Length(gMapToDelete)));
+{
// Èìÿ êàðòû íå ñòàíäàðòíîå òåñòîâîå:
if MapName <> TEST_MAP_NAME then
Exit;
@@ -4069,7 +4072,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
@@ -4095,7 +4098,8 @@ begin
WAD.Free();
g_SetFileTime(WadName, time);
end else
- DeleteFile(WadName);
+}
+ if gTempDelete then DeleteFile(WadName);
end;
procedure GameCVars(P: SArray);
@@ -4748,6 +4752,132 @@ begin
g_Console_Add(_lc[I_MSG_NOT_DEBUG]);
end;
+
+procedure GameCheats(P: SArray);
+var
+ cmd: string;
+ 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
+ begin
+ g_Console_Add('not available');
+ exit;
+ end;
+ plr := gPlayer1;
+ if plr = nil then
+ begin
+ g_Console_Add('where is the player?!');
+ exit;
+ end;
+ cmd := LowerCase(P[0]);
+ // god
+ if cmd = 'god' then
+ begin
+ plr.GodMode := not plr.GodMode;
+ if plr.GodMode then g_Console_Add('player is godlike now') else g_Console_Add('player is mortal now');
+ exit;
+ end;
+ // give
+ if cmd = 'give' then
+ begin
+ if length(P) < 2 then begin g_Console_Add('give what?!'); exit; end;
+ for f := 1 to High(P) do
+ begin
+ cmd := LowerCase(P[f]);
+ if cmd = 'health' then begin plr.RestoreHealthArmor(); g_Console_Add('player feels himself better'); continue; end;
+ if (cmd = 'all') or (cmd = 'weapons') then begin plr.AllRulez(False); g_Console_Add('player got the gifts'); continue; end;
+ if cmd = 'exit' then
+ begin
+ if gTriggers <> nil then
+ begin
+ for a := 0 to High(gTriggers) do
+ begin
+ if gTriggers[a].TriggerType = TRIGGER_EXIT then
+ begin
+ g_Console_Add('player left the map');
+ gExitByTrigger := True;
+ g_Game_ExitLevel(gTriggers[a].Data.MapName);
+ break;
+ end;
+ end;
+ end;
+ continue;
+ end;
+ if cmd = 'air' then begin plr.GiveItem(ITEM_OXYGEN); g_Console_Add('player got some air'); continue; end;
+ if cmd = 'jetpack' then begin plr.GiveItem(ITEM_JETPACK); g_Console_Add('player got jetpack'); continue; end;
+ if cmd = 'suit' then begin plr.GiveItem(ITEM_SUIT); g_Console_Add('player got envirosuit'); continue; end;
+ if cmd = 'berserk' then begin plr.GiveItem(ITEM_MEDKIT_BLACK); g_Console_Add('player got berserk pack'); continue; end;
+ g_Console_Add('i don''t know how to give '''+cmd+'''!');
+ end;
+ exit;
+ end;
+ // open
+ if cmd = 'open' then
+ begin
+ g_Console_Add('player activated sesame');
+ g_Triggers_OpenAll();
+ exit;
+ end;
+ // fly
+ if cmd = 'fly' then
+ begin
+ gFly := not gFly;
+ if gFly then g_Console_Add('player feels himself lighter') else g_Console_Add('player lost his wings');
+ exit;
+ end;
+ // noclip
+ if cmd = 'noclip' then
+ begin
+ plr.SwitchNoClip;
+ g_Console_Add('wall hardeness adjusted');
+ exit;
+ end;
+ // notarget
+ if cmd = 'notarget' then
+ begin
+ plr.NoTarget := not plr.NoTarget;
+ if plr.NoTarget then g_Console_Add('player hides in shadows') else g_Console_Add('player is brave again');
+ exit;
+ end;
+ // noreload
+ if cmd = 'noreload' then
+ begin
+ plr.NoReload := not plr.NoReload;
+ if plr.NoReload then g_Console_Add('player is action hero now') else g_Console_Add('player is ordinary man now');
+ exit;
+ end;
+ // speedy
+ if cmd = 'speedy' then
+ begin
+ MAX_RUNVEL := 32-MAX_RUNVEL;
+ g_Console_Add('speed adjusted');
+ exit;
+ end;
+ // jumpy
+ if cmd = 'jumpy' then
+ begin
+ VEL_JUMP := 30-VEL_JUMP;
+ g_Console_Add('jump height adjusted');
+ exit;
+ end;
+ // automap
+ if cmd = 'automap' then
+ begin
+ gShowMap := not gShowMap;
+ if gShowMap then g_Console_Add('player gains second sight') else g_Console_Add('player lost second sight');
+ exit;
+ end;
+ // aimline
+ if cmd = 'aimline' then
+ begin
+ gAimLine := not gAimLine;
+ if gAimLine then g_Console_Add('player gains laser sight') else g_Console_Add('player lost laser sight');
+ exit;
+ end;
+end;
+
procedure GameCommands(P: SArray);
var
a, b: Integer;
@@ -5168,9 +5298,7 @@ begin
Exit;
end;
// Èãðà åù¸ íå çàïóùåíà, ñíà÷àëà íàì íàäî çàãðóçèòü êàêîé-òî WAD
- if Pos('.wad', LowerCase(P[1])) = 0 then
- P[1] := P[1] + '.wad';
-
+ P[1] := addWadExtension(P[1]);
if FileExists(MapsDir + P[1]) then
begin
// Åñëè êàðòà íå óêàçàíà, áåð¸ì ïåðâóþ êàðòó â ôàéëå
@@ -5224,9 +5352,7 @@ begin
Exit;
prt := StrToIntDef(P[2], 25666);
- if Pos('.wad', LowerCase(P[3])) = 0 then
- P[3] := P[3] + '.wad';
-
+ P[3] := addWadExtension(P[3]);
if FileExists(MapsDir + P[3]) then
begin
// Åñëè êàðòà íå óêàçàíà, áåð¸ì ïåðâóþ êàðòó â ôàéëå
@@ -5296,9 +5422,7 @@ begin
begin
g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
// Òàêîé êàðòû íåò, èùåì WAD ôàéë
- if Pos('.wad', LowerCase(P[1])) = 0 then
- P[1] := P[1] + '.wad';
-
+ P[1] := addWadExtension(P[1]);
if FileExists(MapsDir + P[1]) then
begin
// Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
@@ -5328,9 +5452,7 @@ begin
end else
begin
// Óêàçàíî äâà ïàðàìåòðà, çíà÷èò ïåðâûé - WAD ôàéë, à âòîðîé - êàðòà
- if Pos('.wad', LowerCase(P[1])) = 0 then
- P[1] := P[1] + '.wad';
-
+ P[1] := addWadExtension(P[1]);
if FileExists(MapsDir + P[1]) then
begin
// Íàøëè WAD ôàéë
@@ -5389,9 +5511,7 @@ begin
begin
g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
// Òàêîé êàðòû íåò, èùåì WAD ôàéë
- if Pos('.wad', LowerCase(P[1])) = 0 then
- P[1] := P[1] + '.wad';
-
+ P[1] := addWadExtension(P[1]);
if FileExists(MapsDir + P[1]) then
begin
// Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
@@ -5416,9 +5536,7 @@ begin
end else
begin
// Óêàçàíî äâà ïàðàìåòðà, çíà÷èò ïåðâûé - WAD ôàéë, à âòîðîé - êàðòà
- if Pos('.wad', LowerCase(P[1])) = 0 then
- P[1] := P[1] + '.wad';
-
+ P[1] := addWadExtension(P[1]);
if FileExists(MapsDir + P[1]) then
begin
// Íàøëè WAD ôàéë
@@ -5711,17 +5829,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;
@@ -6245,7 +6389,7 @@ begin
// Start map when game loads:
map := LowerCase(Find_Param_Value(pars, '-map'));
- if (map <> '') and (Pos('.wad:\', map) > 0) then
+ if isWadPath(map) then
begin
// Game mode:
s := Find_Param_Value(pars, '-gm');
@@ -6291,7 +6435,11 @@ begin
// Delete test map after play:
s := Find_Param_Value(pars, '--testdelete');
if (s <> '') then
+ begin
gMapToDelete := MapsDir + map;
+ e_WriteLog('"--testdelete" is deprecated, use --tempdelete.', MSG_FATALERROR);
+ Halt(1);
+ end;
// Delete temporary WAD after play:
s := Find_Param_Value(pars, '--tempdelete');