diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index c09158d4428909d9041a06e6ea7b2b505f0f56ad..686f15692b6a73af4f9c728254ef1948967cba24 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* 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.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
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, utils, md5, mempool, xprofiler,
+ g_touch, g_weapons;
type
TGameSettings = record
DEStr: String;
end;
+ TChatSound = record
+ Sound: TPlayableSound;
+ Tags: Array of String;
+ FullWord: Boolean;
+ end;
+
TPlayerSettings = record
Name: String;
Model: String;
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();
procedure g_Game_Restart();
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_ClientWAD (NewWAD: String; const WHash: TMD5Digest): AnsiString;
+function g_Game_StartMap(asMegawad: Boolean; 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;
procedure g_Game_StopAllSounds(all: Boolean);
procedure g_Game_UpdateTriggerSounds();
function g_Game_GetMegaWADInfo(WAD: String): TMegaWADInfo;
+procedure g_Game_ChatSound(Text: String; Taunt: Boolean = True);
procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
procedure g_Game_Announce_KillCombo(Param: Integer);
+procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
procedure g_Game_StartVote(Command, Initiator: string);
procedure g_Game_CheckVote;
-procedure g_TakeScreenShot();
+procedure g_TakeScreenShot(Filename: string = ''; StatShot: Boolean = False);
procedure g_FatalError(Text: String);
procedure g_SimpleError(Text: String);
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 ProfilerCommands(P: SArray);
+procedure GameCVars(P: SSArray);
+procedure GameCommands(P: SSArray);
+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();
+procedure DrawMenuBackground(tex: AnsiString);
{ procedure SetWinPause(Enable: Boolean); }
DE_GLOBEVENT = 0;
DE_BFGHIT = 1;
DE_KILLCOMBO = 2;
+ DE_BODYKILL = 3;
ANNOUNCE_NONE = 0;
ANNOUNCE_ME = 1;
ANNOUNCE_ALL = 3;
CONFIG_FILENAME = 'Doom2DF.cfg';
- LOG_FILENAME = 'Doom2DF.log';
TEST_MAP_NAME = '$$$_TEST_$$$';
STD_PLAYER_MODEL = 'Doomer';
+{$IFDEF HEADLESS}
+ DEFAULT_PLAYERS = 0;
+{$ELSE}
+ DEFAULT_PLAYERS = 1;
+{$ENDIF}
+
+ STATFILE_VERSION = $03;
+
var
gStdFont: DWORD;
gGameSettings: TGameSettings;
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;
gHearPoint1, gHearPoint2: THearPoint;
gSoundEffectsDF: Boolean = False;
gSoundTriggerTime: Word = 0;
- gAnnouncer: Byte = ANNOUNCE_NONE;
+ gAnnouncer: Integer = ANNOUNCE_NONE;
goodsnd: array[0..3] of TPlayableSound;
killsnd: array[0..3] of TPlayableSound;
+ hahasnd: array[0..2] of TPlayableSound;
+ sound_get_flag: array[0..1] of TPlayableSound;
+ sound_lost_flag: array[0..1] of TPlayableSound;
+ sound_ret_flag: array[0..1] of TPlayableSound;
+ sound_cap_flag: array[0..1] of TPlayableSound;
+ gBodyKillEvent: Integer = -1;
gDefInterTime: ShortInt = -1;
gInterEndTime: LongWord = 0;
gInterTime: LongWord = 0;
gServInterTime: Byte = 0;
gGameStartTime: LongWord = 0;
gTotalMonsters: Integer = 0;
- gPause: Boolean;
- gShowTime: Boolean = True;
+ gPauseMain: Boolean = false;
+ gPauseHolmes: Boolean = false;
+ gShowTime: Boolean = False;
gShowFPS: Boolean = False;
gShowGoals: Boolean = True;
gShowStat: Boolean = True;
gSpectViewTwo: Boolean = False;
gSpectPID1: Integer = -1;
gSpectPID2: Integer = -1;
+ gSpectAuto: Boolean = False;
+ gSpectAutoNext: LongWord;
+ gSpectAutoStepX: Integer;
+ gSpectAutoStepY: Integer;
gMusic: TMusic = nil;
gLoadGameMode: Boolean;
gCheats: Boolean = False;
gMapToDelete: String;
gTempDelete: Boolean = False;
gLastMap: Boolean = False;
- gWinPosX, gWinPosY: Integer;
gWinSizeX, gWinSizeY: Integer;
- gWinFrameX, gWinFrameY, gWinCaption: Integer;
- gWinActive: Boolean = True; // by default window is active, lol
gResolutionChange: Boolean = False;
- gRC_Width, gRC_Height: Word;
+ gRC_Width, gRC_Height: Integer;
gRC_FullScreen, gRC_Maximized: Boolean;
gLanguageChange: Boolean = False;
gDebugMode: Boolean = False;
gVotesEnabled: Boolean = True;
gEvents: Array of TGameEvent;
gDelayedEvents: Array of TDelayedEvent;
+ gUseChatSounds: Boolean = True;
+ gChatSounds: Array of TChatSound;
+ gSelectWeapon: Array [0..1, WP_FIRST..WP_LAST] of Boolean; // [player, weapon]
+ gInterReadyCount: Integer = 0;
+
+ g_dbg_ignore_bounds: Boolean = false;
+ r_smallmap_h: Integer = 0; // 0: left; 1: center; 2: right
+ r_smallmap_v: Integer = 2; // 0: top; 1: center; 2: bottom
// move button values:
// bits 0-1: l/r state:
g_profile_frame_update: Boolean = false;
g_profile_frame_draw: Boolean = false;
g_profile_collision: Boolean = false;
+ 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; inline;
+function gPause (): Boolean; inline;
+
+
implementation
uses
- g_textures, g_main, g_window, g_menu,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+ g_holmes,
+{$ENDIF}
+ e_texture, e_res, g_textures, 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,
- ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
- utils, sfs;
+ g_playermodel, g_gfx, g_options, Math,
+ g_triggers, g_monsters, e_sound, CONFIG,
+ g_language, g_net, g_main,
+ ENet, e_msg, g_netmsg, g_netmaster,
+ sfs, wadreader, g_system;
+
+
+var
+ hasPBarGfx: Boolean = false;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function gPause (): Boolean; inline; begin result := gPauseMain or gPauseHolmes; end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function conIsCheatsEnabled (): Boolean; inline;
+begin
+ result := false;
+ 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;
// ////////////////////////////////////////////////////////////////////////// //
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
ShowCount: Integer;
Msgs: Array of String;
NextMsg: Word;
+ PBarWasHere: Boolean; // did we draw a progress bar for this message?
end;
TParamStrValue = record
FPSCounter, UPSCounter: Word;
FPSTime, UPSTime: LongWord;
DataLoaded: Boolean = False;
- LastScreenShot: Int64;
IsDrawStat: Boolean = False;
CustomStat: TEndCustomGameStat;
SingleStat: TEndSingleGameStat;
EndingGameCounter: Byte = 0;
MessageText: String;
MessageTime: Word;
- MapList: SArray = nil;
+ MessageLineLength: Integer = 80;
+ MapList: SSArray = nil;
MapIndex: Integer = -1;
+ InterReadyTime: Integer = -1;
+ StatShotDone: Boolean = False;
+ StatFilename: string = ''; // used by stat screenshot to save with the same name as the csv
+ StatDate: string = '';
MegaWAD: record
info: TMegaWADInfo;
endpic: String;
end;
//InterPic: String;
InterText: record
- lines: SArray;
+ lines: SSArray;
img: String;
cur_line: Integer;
cur_char: Integer;
end;
end;
+// saves a shitty CSV containing the game stats passed to it
+procedure SaveGameStat(Stat: TEndCustomGameStat; Path: string);
+var
+ s: TextFile;
+ dir, fname, map, mode, etime: String;
+ I: Integer;
+begin
+ try
+ dir := e_GetWriteableDir(StatsDirs);
+ // stats are placed in stats/yy/mm/dd/*.csv
+ fname := e_CatPath(dir, Path);
+ ForceDirectories(fname); // ensure yy/mm/dd exists within the stats dir
+ fname := e_CatPath(fname, StatFilename + '.csv');
+ AssignFile(s, fname);
+ try
+ Rewrite(s);
+ // line 1: stats version, datetime, server name, map name, game mode, time limit, score limit, dmflags, game time, number of players
+ if g_Game_IsNet then fname := NetServerName else fname := '';
+ map := g_ExtractWadNameNoPath(gMapInfo.Map) + ':/' + g_ExtractFileName(gMapInfo.Map);
+ mode := g_Game_ModeToText(Stat.GameMode);
+ etime := Format('%d:%.2d:%.2d', [Stat.GameTime div 1000 div 3600,
+ (Stat.GameTime div 1000 div 60) mod 60,
+ Stat.GameTime div 1000 mod 60]);
+ WriteLn(s, 'stats_ver,datetime,server,map,mode,timelimit,scorelimit,dmflags,time,num_players');
+ WriteLn(s,
+ Format('%d,%s,%s,%s,%s,%u,%u,%u,%s,%d',
+ [STATFILE_VERSION, StatDate, fname, map, mode, gGameSettings.TimeLimit, gGameSettings.GoalLimit, gGameSettings.Options, etime, Length(Stat.PlayerStat)]));
+ // line 2: game specific shit
+ // if it's a team game: red score, blue score
+ // if it's a coop game: monsters killed, monsters total, secrets found, secrets total
+ // otherwise nothing
+ if Stat.GameMode in [GM_TDM, GM_CTF] then
+ WriteLn(s, Format('red_score,blue_score' + LineEnding + '%d,%d', [Stat.TeamStat[TEAM_RED].Goals, Stat.TeamStat[TEAM_BLUE].Goals]))
+ else if Stat.GameMode in [GM_COOP, GM_SINGLE] then
+ WriteLn(s, Format('mon_killed,mon_total,secrets_found,secrets_total' + LineEnding + '%d,%d,%d,%d', [gCoopMonstersKilled, gTotalMonsters, gCoopSecretsFound, gSecretsCount]));
+ // lines 3-...: team, player name, frags, deaths
+ WriteLn(s, 'team,name,frags,deaths');
+ for I := Low(Stat.PlayerStat) to High(Stat.PlayerStat) do
+ with Stat.PlayerStat[I] do
+ WriteLn(s, Format('%d,%s,%d,%d', [Team, Name, Frags, Deaths]));
+ except
+ g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [fname]));
+ end;
+ except
+ g_Console_Add('could not create gamestats file "' + fname + '"');
+ end;
+ CloseFile(s);
+end;
+
function g_Game_ModeToText(Mode: Byte): string;
begin
Result := '';
cfg: TConfig;
p: Pointer;
{b, }len: Integer;
- s: string;
+ s: AnsiString;
begin
g_Game_FreeWAD();
gGameSettings.WAD := WAD;
if not (gGameSettings.GameMode in [GM_COOP, GM_SINGLE]) then
Exit;
- MegaWAD.info := g_Game_GetMegaWADInfo(MapsDir + WAD);
+ MegaWAD.info := g_Game_GetMegaWADInfo(WAD);
w := TWADFile.Create();
- w.ReadFile(MapsDir + WAD);
+ w.ReadFile(WAD);
if not w.GetResource('INTERSCRIPT', p, len) then
begin
MegaWAD.endpic := cfg.ReadStr('megawad', 'endpic', '');
if MegaWAD.endpic <> '' then
begin
- s := g_ExtractWadName(MegaWAD.endpic);
- if s = '' then s := MapsDir+WAD else s := GameDir+'/wads/';
- g_Texture_CreateWADEx('TEXTURE_endpic', s+MegaWAD.endpic);
+ TEXTUREFILTER := GL_LINEAR;
+ s := e_GetResourcePath(WadDirs, MegaWAD.endpic, WAD);
+ g_Texture_CreateWADEx('TEXTURE_endpic', s);
+ TEXTUREFILTER := GL_NEAREST;
end;
MegaWAD.endmus := cfg.ReadStr('megawad', 'endmus', 'Standart.wad:D2DMUS\ÊÎÍÅÖ');
if MegaWAD.endmus <> '' then
begin
- s := g_ExtractWadName(MegaWAD.endmus);
- if s = '' then s := MapsDir+WAD else s := GameDir+'/wads/';
- g_Sound_CreateWADEx('MUSIC_endmus', s+MegaWAD.endmus, True);
+ s := e_GetResourcePath(WadDirs, MegaWAD.endmus, WAD);
+ g_Sound_CreateWADEx('MUSIC_endmus', s, True);
end;
cfg.Free();
if gPlayer2 <> nil then gPlayer2.GodMode := False;
if gPlayer1 <> nil then gPlayer1.NoTarget := False;
if gPlayer2 <> nil then gPlayer2.NoTarget := False;
+
+ {$IF DEFINED(D2F_DEBUG)}
+ if gPlayer1 <> nil then gPlayer1.NoTarget := True;
+ gAimLine := g_dbg_aimline_on;
+ {$ENDIF}
end;
procedure g_Game_ExecuteEvent(Name: String);
gDelayedEvents[n].DENum := Num;
gDelayedEvents[n].DEStr := Str;
if DEType = DE_GLOBEVENT then
- gDelayedEvents[n].Time := (GetTimer() {div 1000}) + Time
+ gDelayedEvents[n].Time := (sys_GetTicks() {div 1000}) + Time
else
gDelayedEvents[n].Time := gTime + Time;
Result := n;
var
a: Integer;
FileName: string;
+ t: TDateTime;
begin
if g_Game_IsNet and g_Game_IsServer then
MH_SEND_GameEvent(NET_EV_MAPEND, Byte(gMissionFailed));
// Ñòîï èãðà:
- gPause := False;
- gGameOn := False;
+ gPauseMain := false;
+ gPauseHolmes := false;
+ gGameOn := false;
g_Game_StopAllSounds(False);
end
else
slWaitStr := _lc[I_NET_SLIST_ERROR];
+ g_Serverlist_GenerateTable(slCurrent, slTable);
end;
g_Game_ExecuteEvent('ongameend');
SetLength(CustomStat.PlayerStat, Length(CustomStat.PlayerStat)+1);
with CustomStat.PlayerStat[High(CustomStat.PlayerStat)] do
begin
+ Num := a;
Name := gPlayers[a].Name;
Frags := gPlayers[a].Frags;
Deaths := gPlayers[a].Death;
end;
SortGameStat(CustomStat.PlayerStat);
+
+ if gSaveStats or gScreenshotStats then
+ begin
+ t := Now;
+ if g_Game_IsNet then StatFilename := NetServerName else StatFilename := 'local';
+ StatDate := FormatDateTime('yymmdd_hhnnss', t);
+ StatFilename := StatFilename + '_' + CustomStat.Map + '_' + g_Game_ModeToText(CustomStat.GameMode);
+ StatFilename := sanitizeFilename(StatFilename) + '_' + StatDate;
+ if gSaveStats then SaveGameStat(CustomStat, FormatDateTime('yyyy"/"mm"/"dd', t));
+ end;
+
+ StatShotDone := False;
end;
g_Game_ExecuteEvent('onmapend');
+ if not g_Game_IsClient then g_Player_ResetReady;
+ gInterReadyCount := 0;
// Çàòóõàþùèé ýêðàí:
EndingGameCounter := 255;
gMusic.SetByName('MUSIC_INTERMUS');
gMusic.Play();
gState := STATE_INTERSINGLE;
+ e_UnpressAllKeys();
g_Game_ExecuteEvent('oninter');
end
gExit := 0;
end;
+procedure drawTime(X, Y: Integer); inline;
+begin
+ e_TextureFontPrint(x, y,
+ Format('%d:%.2d:%.2d', [
+ gTime div 1000 div 3600,
+ (gTime div 1000 div 60) mod 60,
+ gTime div 1000 mod 60
+ ]),
+ gStdFont);
+end;
+
procedure DrawStat();
var
pc, x, y, w, h: Integer;
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);
+ drawTime(x+w-78, y+8);
+
wad := g_ExtractWadNameNoPath(gMapInfo.Map);
map := g_ExtractFileName(gMapInfo.Map);
mapstr := wad + ':\' + map + ' - ' + gMapInfo.Name;
procedure g_Game_Init();
var
SR: TSearchRec;
+ knownFiles: array of AnsiString = nil;
+ found: Boolean;
+ wext, s: AnsiString;
+ f: Integer;
begin
gExit := 0;
gMapToDelete := '';
sfsGCDisable(); // temporary disable removing of temporary volumes
try
+ TEXTUREFILTER := GL_LINEAR;
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');
+ TEXTUREFILTER := GL_NEAREST;
LoadStdFont('STDTXT', 'STDFONT', gStdFont);
LoadFont('MENUTXT', 'MENUFONT', gMenuFont);
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;
+ // load models from all possible wad types, in all known directories
+ // this does a loosy job (linear search, ooph!), but meh
+ for wext in wadExtensions do
+ begin
+ for f := High(ModelDirs) downto Low(ModelDirs) do
+ begin
+ if (FindFirst(ModelDirs[f]+DirectorySeparator+'*'+wext, faAnyFile, SR) = 0) then
+ begin
+ repeat
+ found := false;
+ for s in knownFiles do
+ begin
+ if (strEquCI1251(forceFilenameExt(SR.Name, ''), forceFilenameExt(ExtractFileName(s), ''))) then
+ begin
+ found := true;
+ break;
+ end;
+ end;
+ if not found then
+ begin
+ SetLength(knownFiles, length(knownFiles)+1);
+ knownFiles[High(knownFiles)] := ModelDirs[f]+DirectorySeparator+SR.Name;
+ end;
+ until (FindNext(SR) <> 0);
+ end;
+ FindClose(SR);
+ end;
+ end;
+
+ if (length(knownFiles) = 0) then raise Exception.Create('no player models found!');
+
+ if (length(knownFiles) = 1) then e_LogWriteln('1 player model found.', TMsgType.Notify) else e_LogWritefln('%d player models found.', [Integer(length(knownFiles))], TMsgType.Notify);
+ for s in knownFiles do
+ begin
+ if not g_PlayerModel_Load(s) then e_LogWritefln('Error loading model "%s"', [s], TMsgType.Warning);
+ end;
+
+ gGameOn := false;
+ gPauseMain := false;
+ gPauseHolmes := false;
gTime := 0;
- LastScreenShot := 0;
{e_MouseInfo.Accel := 1.0;}
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_ROUNDMUS', GameWAD+':MUSIC\ROUNDMUS', True, True);
g_Sound_CreateWADEx('MUSIC_STDENDMUS', GameWAD+':MUSIC\ENDMUS', True);
+{$IFNDEF HEADLESS}
g_Game_SetLoadingText(_lc[I_LOAD_MENUS], 0, False);
g_Menu_Init();
+{$ENDIF}
gMusic := TMusic.Create();
gMusic.SetByName('MUSIC_MENU');
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();
Result := ids[(Length(ids) - 1 + idx) mod Length(ids)];
end;
-function isKeyPressed (key1: Word; key2: Word): Boolean;
+function GetActivePlayerID_Random(Skip: Integer = -1): Integer;
+var
+ a, idx: Integer;
+ ids: Array of Word;
+begin
+ Result := -1;
+ if gPlayers = nil then
+ Exit;
+ SetLength(ids, 0);
+ idx := -1;
+ for a := Low(gPlayers) to High(gPlayers) do
+ if IsActivePlayer(gPlayers[a]) then
+ begin
+ SetLength(ids, Length(ids) + 1);
+ ids[High(ids)] := gPlayers[a].UID;
+ if gPlayers[a].UID = Skip then
+ idx := High(ids);
+ end;
+ if Length(ids) = 0 then
+ Exit;
+ if Length(ids) = 1 then
+ begin
+ Result := ids[0];
+ Exit;
+ end;
+ Result := ids[Random(Length(ids))];
+ a := 10;
+ while (idx <> -1) and (Result = Skip) and (a > 0) do
+ begin
+ Result := ids[Random(Length(ids))];
+ Dec(a);
+ end;
+end;
+
+function GetRandomSpectMode(Current: Byte): Byte;
+label
+ retry;
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;
+ Result := Current;
+retry:
+ case Random(7) of
+ 0: Result := SPECT_STATS;
+ 1: Result := SPECT_MAPVIEW;
+ 2: Result := SPECT_MAPVIEW;
+ 3: Result := SPECT_PLAYERS;
+ 4: Result := SPECT_PLAYERS;
+ 5: Result := SPECT_PLAYERS;
+ 6: Result := SPECT_PLAYERS;
+ end;
+ if (Current in [SPECT_STATS, SPECT_MAPVIEW]) and (Current = Result) then
+ goto retry;
end;
-procedure processPlayerControls (plr: TPlayer; var ctrl: TPlayerControl; var MoveButton: Byte; p2hack: Boolean=false);
-var
- time: Word;
- strafeDir: Byte;
- i: Integer;
+procedure ProcessPlayerControls (plr: TPlayer; p: Integer; var MoveButton: Byte);
+ var
+ time: Word;
+ strafeDir: Byte;
+ i: Integer;
begin
if (plr = nil) then exit;
- if (p2hack) then time := 1000 else time := 1;
+ if (p = 2) then time := 1000 else time := 1;
strafeDir := MoveButton shr 4;
MoveButton := MoveButton and $0F;
- 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 gPlayerAction[p, ACTION_MOVELEFT] and (not gPlayerAction[p, ACTION_MOVERIGHT]) then
+ MoveButton := 1 // Íàæàòà òîëüêî "Âëåâî"
+ else if (not gPlayerAction[p, ACTION_MOVELEFT]) and gPlayerAction[p, ACTION_MOVERIGHT] then
+ MoveButton := 2 // Íàæàòà òîëüêî "Âïðàâî"
+ else if (not gPlayerAction[p, ACTION_MOVELEFT]) and (not gPlayerAction[p, ACTION_MOVERIGHT]) then
+ MoveButton := 0; // Íå íàæàòû íè "Âëåâî", íè "Âïðàâî"
+
+ // Ñåé÷àñ èëè ðàíüøå áûëè íàæàòû "Âëåâî"/"Âïðàâî" => ïåðåäàåì èãðîêó:
+ if MoveButton = 1 then
+ plr.PressKey(KEY_LEFT, time)
+ else if MoveButton = 2 then
+ plr.PressKey(KEY_RIGHT, time);
+
+ // if we have "strafe" key, turn off old strafe mechanics
+ if gPlayerAction[p, ACTION_STRAFE] then
+ begin
+ // new strafe mechanics
+ if (strafeDir = 0) then
+ strafeDir := MoveButton; // start strafing
+ // now set direction according to strafe (reversed)
+ if (strafeDir = 2) then
+ plr.SetDirection(TDirection.D_LEFT)
+ else if (strafeDir = 1) then
+ plr.SetDirection(TDirection.D_RIGHT)
+ end
+ else
+ begin
+ strafeDir := 0; // not strafing anymore
+ // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî:
+ if (MoveButton = 2) and gPlayerAction[p, ACTION_MOVELEFT] then
+ plr.SetDirection(TDirection.D_LEFT)
+ // Ðàíüøå áûëà íàæàòà "Âëåâî", à ñåé÷àñ "Âïðàâî" => áåæèì âëåâî, ñìîòðèì âïðàâî:
+ else if (MoveButton = 1) and gPlayerAction[p, ACTION_MOVERIGHT] then
+ plr.SetDirection(TDirection.D_RIGHT)
+ // ×òî-òî áûëî íàæàòî è íå èçìåíèëîñü => êóäà áåæèì, òóäà è ñìîòðèì:
+ else if MoveButton <> 0 then
+ plr.SetDirection(TDirection(MoveButton-1))
+ end;
- // if we have "strafe" key, turn off old strafe mechanics
- if isKeyPressed(KeyStrafe, KeyStrafe2) then
- begin
- // new strafe mechanics
- if (strafeDir = 0) then strafeDir := MoveButton; // start strafing
- // now set direction according to strafe (reversed)
- if (strafeDir = 2) then plr.SetDirection(D_LEFT)
- else if (strafeDir = 1) then plr.SetDirection(D_RIGHT);
- end
- else
- begin
- strafeDir := 0; // not strafing anymore
- // Ðàíüøå áûëà íàæàòà "Âïðàâî", à ñåé÷àñ "Âëåâî" => áåæèì âïðàâî, ñìîòðèì âëåâî:
- 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));
- end;
+ // fix movebutton state
+ MoveButton := MoveButton or (strafeDir shl 4);
- // fix movebutton state
- MoveButton := MoveButton or (strafeDir shl 4);
+ // Îñòàëüíûå êëàâèøè:
+ if gPlayerAction[p, ACTION_JUMP] then plr.PressKey(KEY_JUMP, time);
+ if gPlayerAction[p, ACTION_LOOKUP] then plr.PressKey(KEY_UP, time);
+ if gPlayerAction[p, ACTION_LOOKDOWN] then plr.PressKey(KEY_DOWN, time);
+ if gPlayerAction[p, ACTION_ATTACK] then plr.PressKey(KEY_FIRE);
+ if gPlayerAction[p, ACTION_WEAPNEXT] then plr.PressKey(KEY_NEXTWEAPON);
+ if gPlayerAction[p, ACTION_WEAPPREV] then plr.PressKey(KEY_PREVWEAPON);
+ if gPlayerAction[p, ACTION_ACTIVATE] then plr.PressKey(KEY_OPEN);
- // Îñòàëüíûå êëàâèøè:
- 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);
+ gPlayerAction[p, ACTION_WEAPNEXT] := False; // HACK, remove after readyweaon&pendinweapon implementation
+ gPlayerAction[p, ACTION_WEAPPREV] := False; // HACK, remove after readyweaon&pendinweapon implementation
- for i := 0 to High(KeyWeapon) do
- if isKeyPressed(KeyWeapon[i], KeyWeapon2[i]) then
- plr.QueueWeaponSwitch(i); // all choices are passed there, and god will take the best
+ for i := WP_FIRST to WP_LAST do
+ begin
+ if gSelectWeapon[p, i] then
+ begin
+ plr.QueueWeaponSwitch(i); // all choices are passed there, and god will take the best
+ gSelectWeapon[p, i] := False
+ end
end;
// HACK: add dynlight here
if gwin_has_stencil and g_playerLight then g_AddDynLight(plr.GameX+32, plr.GameY+40, 128, 1, 1, 0, 0.6);
end;
+// HACK: don't have a "key was pressed" function
+procedure InterReady();
+begin
+ if InterReadyTime > gTime then Exit;
+ InterReadyTime := gTime + 3000;
+ MC_SEND_CheatRequest(NET_CHEAT_READY);
+end;
+
procedure g_Game_Update();
var
Msg: g_gui.TMessage;
w: Word;
i, b: Integer;
- function sendMonsPos (monidx: Integer; mon: TMonster): Boolean;
+ 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();
+ framePool.reset();
+
// Ïîðà âûêëþ÷àòü èãðó:
if gExit = EXIT_QUIT then
Exit;
Exit;
end;
-// ×èòàåì êëàâèàòóðó è äæîéñòèê, åñëè îêíî àêòèâíî:
- e_PollInput();
+ // ×èòàåì êëàâèàòóðó è äæîéñòèê, åñëè îêíî àêòèâíî
+ // no need to, as we'll do it in event handler
// Îáíîâëÿåì êîíñîëü (äâèæåíèå è ñîîáùåíèÿ):
g_Console_Update();
Exit;
end;
+ // process master server communications
+ g_Net_Slist_Pulse();
+
case gState of
STATE_INTERSINGLE, // Ñòàòèñòêà ïîñëå ïðîõîæäåíèÿ óðîâíÿ â Îäèíî÷íîé èãðå
STATE_INTERCUSTOM, // Ñòàòèñòêà ïîñëå ïðîõîæäåíèÿ óðîâíÿ â Ñâîåé èãðå
if (not g_Game_IsClient) and
(
(
- (e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE))
+ (
+ e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE) or
+ e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+ e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or
+ e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK)
+ )
and (not gJustChatted) and (not gConsoleShow) and (not gChatShow)
and (g_ActiveWindow = nil)
)
- or (g_Game_IsNet and (gInterTime > gInterEndTime))
+ or (g_Game_IsNet and ((gInterTime > gInterEndTime) or ((gInterReadyCount >= NetClientCount) and (NetClientCount > 0))))
)
then
begin // Íàæàëè <Enter>/<Ïðîáåë> èëè ïðîøëî äîñòàòî÷íî âðåìåíè:
end;
Exit;
+ end
+ else if g_Game_IsClient and
+ (
+ (
+ e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(IK_SPACE) or
+ e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+ e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or
+ e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK)
+ )
+ and (not gJustChatted) and (not gConsoleShow) and (not gChatShow)
+ and (g_ActiveWindow = nil)
+ )
+ then
+ begin
+ // ready / unready
+ InterReady();
end;
if gState = STATE_INTERTEXT then
// Çàêîí÷èëñÿ óðîâåíü â Ñâîåé èãðå:
if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
begin
+ InterReadyTime := -1;
if gLastMap and (gGameSettings.GameMode = GM_COOP) then
begin
g_Game_ExecuteEvent('onwadend');
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
end;
STATE_SLIST:
- g_Serverlist_Control(slCurrent);
+ g_Serverlist_Control(slCurrent, slTable);
end;
- if g_Game_IsNet then
- if not gConsoleShow then
- if not gChatShow then
- begin
- if g_ActiveWindow = nil then
- begin
- if e_KeyPressed(gGameControls.GameControls.Chat) then
- g_Console_Chat_Switch(False)
- else if (e_KeyPressed(gGameControls.GameControls.TeamChat)) and
- (gGameSettings.GameMode in [GM_TDM, GM_CTF]) then
- g_Console_Chat_Switch(True);
- end;
- end else
- if not gChatEnter then
- if (not e_KeyPressed(gGameControls.GameControls.Chat))
- and (not e_KeyPressed(gGameControls.GameControls.TeamChat)) then
- gChatEnter := True;
-
// Ñòàòèñòèêà ïî Tab:
if gGameOn then
- IsDrawStat := (not gConsoleShow) and (not gChatShow) and
- (gGameSettings.GameType <> GT_SINGLE) and
- e_KeyPressed(gGameControls.GameControls.Stat);
+ IsDrawStat := (not gConsoleShow) and (not gChatShow) and (gGameSettings.GameType <> GT_SINGLE) and g_Console_Action(ACTION_SCORES);
// Èãðà èäåò:
if gGameOn and not gPause and (gState <> STATE_FOLD) then
if gPlayer2 <> nil then gPlayer2.ReleaseKeys();
if (not gConsoleShow) and (not gChatShow) and (g_ActiveWindow = nil) then
begin
- processPlayerControls(gPlayer1, gGameControls.P1Control, P1MoveButton);
- processPlayerControls(gPlayer2, gGameControls.P2Control, P2MoveButton, true);
+ ProcessPlayerControls(gPlayer1, 0, P1MoveButton);
+ ProcessPlayerControls(gPlayer2, 1, P2MoveButton);
end // if not console
else
begin
begin
if not gSpectKeyPress then
begin
- if isKeyPressed(gGameControls.P1Control.KeyJump, gGameControls.P1Control.KeyJump2) then
+ if gPlayerAction[0, ACTION_JUMP] and (not gSpectAuto) then
begin
// switch spect mode
case gSpectMode of
end;
gSpectKeyPress := True;
end;
- if gSpectMode = SPECT_MAPVIEW then
+ if (gSpectMode = SPECT_MAPVIEW)
+ and (not gSpectAuto) then
begin
- if isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2) then
+ if gPlayerAction[0, ACTION_MOVELEFT] then
gSpectX := Max(gSpectX - gSpectStep, 0);
- if isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2) then
+ if gPlayerAction[0, ACTION_MOVERIGHT] then
gSpectX := Min(gSpectX + gSpectStep, gMapInfo.Width - gScreenWidth);
- if isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2) then
+ if gPlayerAction[0, ACTION_LOOKUP] then
gSpectY := Max(gSpectY - gSpectStep, 0);
- if isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2) then
+ if gPlayerAction[0, ACTION_LOOKDOWN] then
gSpectY := Min(gSpectY + gSpectStep, gMapInfo.Height - gScreenHeight);
- if isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2) then
+ if gPlayerAction[0, ACTION_WEAPPREV] then
begin
// decrease step
if gSpectStep > 4 then gSpectStep := gSpectStep shr 1;
gSpectKeyPress := True;
end;
- if isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2) then
+ if gPlayerAction[0, ACTION_WEAPNEXT] then
begin
// increase step
if gSpectStep < 64 then gSpectStep := gSpectStep shl 1;
gSpectKeyPress := True;
end;
end;
- if gSpectMode = SPECT_PLAYERS then
+ if (gSpectMode = SPECT_PLAYERS)
+ and (not gSpectAuto) then
begin
- if isKeyPressed(gGameControls.P1Control.KeyUp, gGameControls.P1Control.KeyUp2) then
+ if gPlayerAction[0, ACTION_LOOKUP] then
begin
// add second view
gSpectViewTwo := True;
gSpectKeyPress := True;
end;
- if isKeyPressed(gGameControls.P1Control.KeyDown, gGameControls.P1Control.KeyDown2) then
+ if gPlayerAction[0, ACTION_LOOKDOWN] then
begin
// remove second view
gSpectViewTwo := False;
gSpectKeyPress := True;
end;
- if isKeyPressed(gGameControls.P1Control.KeyLeft, gGameControls.P1Control.KeyLeft2) then
+ if gPlayerAction[0, ACTION_MOVELEFT] then
begin
// prev player (view 1)
gSpectPID1 := GetActivePlayerID_Prev(gSpectPID1);
gSpectKeyPress := True;
end;
- if isKeyPressed(gGameControls.P1Control.KeyRight, gGameControls.P1Control.KeyRight2) then
+ if gPlayerAction[0, ACTION_MOVERIGHT] then
begin
// next player (view 1)
gSpectPID1 := GetActivePlayerID_Next(gSpectPID1);
gSpectKeyPress := True;
end;
- if isKeyPressed(gGameControls.P1Control.KeyPrevWeapon, gGameControls.P1Control.KeyPrevWeapon2) then
+ if gPlayerAction[0, ACTION_WEAPPREV] then
begin
// prev player (view 2)
gSpectPID2 := GetActivePlayerID_Prev(gSpectPID2);
gSpectKeyPress := True;
end;
- if isKeyPressed(gGameControls.P1Control.KeyNextWeapon, gGameControls.P1Control.KeyNextWeapon2) then
+ if gPlayerAction[0, ACTION_WEAPNEXT] then
begin
// next player (view 2)
gSpectPID2 := GetActivePlayerID_Next(gSpectPID2);
gSpectKeyPress := True;
end;
end;
+ if gPlayerAction[0, ACTION_ATTACK] then
+ begin
+ if (gSpectMode = SPECT_STATS) and (not gSpectAuto) then
+ begin
+ gSpectAuto := True;
+ gSpectAutoNext := 0;
+ gSpectViewTwo := False;
+ gSpectKeyPress := True;
+ end
+ else
+ if gSpectAuto then
+ begin
+ gSpectMode := SPECT_STATS;
+ gSpectAuto := False;
+ gSpectKeyPress := True;
+ end;
+ end;
end
else
- 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
+ if (not gPlayerAction[0, ACTION_JUMP]) and
+ (not gPlayerAction[0, ACTION_ATTACK]) and
+ (not gPlayerAction[0, ACTION_MOVELEFT]) and
+ (not gPlayerAction[0, ACTION_MOVERIGHT]) and
+ (not gPlayerAction[0, ACTION_LOOKUP]) and
+ (not gPlayerAction[0, ACTION_LOOKDOWN]) and
+ (not gPlayerAction[0, ACTION_WEAPPREV]) and
+ (not gPlayerAction[0, ACTION_WEAPNEXT]) then
gSpectKeyPress := False;
+
+ if gSpectAuto then
+ begin
+ if gSpectMode = SPECT_MAPVIEW then
+ begin
+ i := Min(Max(gSpectX + gSpectAutoStepX, 0), gMapInfo.Width - gScreenWidth);
+ if i = gSpectX then
+ gSpectAutoNext := gTime
+ else
+ gSpectX := i;
+ i := Min(Max(gSpectY + gSpectAutoStepY, 0), gMapInfo.Height - gScreenHeight);
+ if i = gSpectY then
+ gSpectAutoNext := gTime
+ else
+ gSpectY := i;
+ end;
+ if gSpectAutoNext <= gTime then
+ begin
+ if gSpectAutoNext > 0 then
+ begin
+ gSpectMode := GetRandomSpectMode(gSpectMode);
+ case gSpectMode of
+ SPECT_MAPVIEW:
+ begin
+ gSpectX := Random(gMapInfo.Width - gScreenWidth);
+ gSpectY := Random(gMapInfo.Height - gScreenHeight);
+ gSpectAutoStepX := Random(9) - 4;
+ gSpectAutoStepY := Random(9) - 4;
+ if ((gSpectX < 800) and (gSpectAutoStepX < 0)) or
+ ((gSpectX > gMapInfo.Width - gScreenWidth - 800) and (gSpectAutoStepX > 0)) then
+ gSpectAutoStepX := gSpectAutoStepX * -1;
+ if ((gSpectY < 800) and (gSpectAutoStepY < 0)) or
+ ((gSpectY > gMapInfo.Height - gScreenHeight - 800) and (gSpectAutoStepY > 0)) then
+ gSpectAutoStepY := gSpectAutoStepY * -1;
+ end;
+ SPECT_PLAYERS:
+ begin
+ gSpectPID1 := GetActivePlayerID_Random(gSpectPID1);
+ end;
+ end;
+ end;
+ case gSpectMode of
+ SPECT_STATS: gSpectAutoNext := gTime + (Random(3) + 5) * 1000;
+ SPECT_MAPVIEW: gSpectAutoNext := gTime + (Random(4) + 7) * 1000;
+ SPECT_PLAYERS: gSpectAutoNext := gTime + (Random(7) + 8) * 1000;
+ end;
+ end;
+ end;
end;
// Îáíîâëÿåì âñå îñòàëüíîå:
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
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();
+
+ g_Net_Slist_ServerUpdate();
+ {
if NetUseMaster then
- if gTime >= NetTimeToMaster then
+ begin
+ if (gTime >= NetTimeToMaster) or g_Net_Slist_IsConnectionInProgress 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]);
-
+ if (not g_Net_Slist_IsConnectionActive) then g_Net_Slist_Connect(false); // non-blocking connection to the master
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 ...
// Àêòèâíî îêíî èíòåðôåéñà - ïåðåäàåì êëàâèøè åìó:
// Íóæíî ñìåíèòü ðàçðåøåíèå:
if gResolutionChange then
begin
- e_WriteLog('Changing resolution', MSG_NOTIFY);
+ e_WriteLog('Changing resolution', TMsgType.Notify);
g_Game_ChangeResolution(gRC_Width, gRC_Height, gRC_FullScreen, gRC_Maximized);
gResolutionChange := False;
+ g_ActiveWindow := nil;
end;
// Íóæíî ñìåíèòü ÿçûê:
//e_WriteLog('Read language file', MSG_NOTIFY);
//g_Language_Load(DataDir + gLanguage + '.txt');
g_Language_Set(gLanguage);
+{$IFNDEF HEADLESS}
g_Menu_Reset();
+{$ENDIF}
gLanguageChange := False;
end;
end;
-// Äåëàåì ñêðèíøîò (íå ÷àùå 200 ìèëëèñåêóíä):
- if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) then
- if (GetTimer()-LastScreenShot) > 200000 div 1000 then
- begin
- g_TakeScreenShot();
- LastScreenShot := GetTimer();
- end;
-
// Ãîðÿ÷àÿ êëàâèøà äëÿ âûçîâà ìåíþ âûõîäà èç èãðû (F10):
if e_KeyPressed(IK_F10) and
gGameOn and
KeyPress(IK_F10);
end;
- Time := GetTimer() {div 1000};
+ Time := sys_GetTicks() {div 1000};
// Îáðàáîòêà îòëîæåííûõ ñîáûòèé:
if gDelayedEvents <> nil then
if g_Game_IsNet and g_Game_IsServer then
MH_SEND_GameEvent(NET_EV_KILLCOMBO, gDelayedEvents[a].DENum);
end;
+ DE_BODYKILL:
+ if gGameOn then
+ g_Game_Announce_BodyKill(gDelayedEvents[a].DENum);
end;
gDelayedEvents[a].Pending := False;
end;
UPSTime := Time;
end;
- if gGameOn then g_Weapon_AddDynLights();
+ if gGameOn then
+ begin
+ g_Weapon_AddDynLights();
+ g_Items_AddDynLights();
+ end;
+end;
+
+procedure g_Game_LoadChatSounds(Resource: string);
+var
+ WAD: TWADFile;
+ FileName, Snd: string;
+ p: Pointer;
+ len, cnt, tags, i, j: Integer;
+ cfg: TConfig;
+begin
+ FileName := g_ExtractWadName(Resource);
+
+ WAD := TWADFile.Create();
+ WAD.ReadFile(FileName);
+
+ if not WAD.GetResource(g_ExtractFilePathName(Resource), p, len) then
+ begin
+ gChatSounds := nil;
+ WAD.Free();
+ Exit;
+ end;
+
+ cfg := TConfig.CreateMem(p, len);
+ cnt := cfg.ReadInt('ChatSounds', 'Count', 0);
+
+ SetLength(gChatSounds, cnt);
+ for i := 0 to Length(gChatSounds) - 1 do
+ begin
+ gChatSounds[i].Sound := nil;
+ Snd := Trim(cfg.ReadStr(IntToStr(i), 'Sound', ''));
+ tags := cfg.ReadInt(IntToStr(i), 'Tags', 0);
+ if (Snd = '') or (Tags <= 0) then
+ continue;
+ g_Sound_CreateWADEx('SOUND_CHAT_MACRO' + IntToStr(i), GameWAD+':'+Snd);
+ gChatSounds[i].Sound := TPlayableSound.Create();
+ gChatSounds[i].Sound.SetByName('SOUND_CHAT_MACRO' + IntToStr(i));
+ SetLength(gChatSounds[i].Tags, tags);
+ for j := 0 to tags - 1 do
+ gChatSounds[i].Tags[j] := toLowerCase1251(cfg.ReadStr(IntToStr(i), 'Tag' + IntToStr(j), ''));
+ gChatSounds[i].FullWord := cfg.ReadBool(IntToStr(i), 'FullWord', False);
+ end;
+
+ cfg.Free();
+ WAD.Free();
+end;
+
+procedure g_Game_FreeChatSounds();
+var
+ i: Integer;
+begin
+ for i := 0 to Length(gChatSounds) - 1 do
+ begin
+ gChatSounds[i].Sound.Free();
+ g_Sound_Delete('SOUND_CHAT_MACRO' + IntToStr(i));
+ end;
+ SetLength(gChatSounds, 0);
+ gChatSounds := nil;
end;
procedure g_Game_LoadData();
+var
+ wl, hl: Integer;
+ wr, hr: Integer;
+ wb, hb: Integer;
+ wm, hm: Integer;
begin
if DataLoaded then Exit;
- e_WriteLog('Loading game data...', MSG_NOTIFY);
+ e_WriteLog('Loading game data...', TMsgType.Notify);
g_Texture_CreateWADEx('NOTEXTURE', GameWAD+':TEXTURES\NOTEXTURE');
g_Texture_CreateWADEx('TEXTURE_PLAYER_HUD', GameWAD+':TEXTURES\HUD');
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_R_BASE');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_S', GameWAD+':TEXTURES\FLAGHUD_R_STOLEN');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_REDFLAG_D', GameWAD+':TEXTURES\FLAGHUD_R_DROP');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG', GameWAD+':TEXTURES\FLAGHUD_B_BASE');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_S', GameWAD+':TEXTURES\FLAGHUD_B_STOLEN');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_B_DROP');
g_Texture_CreateWADEx('TEXTURE_PLAYER_TALKBUBBLE', GameWAD+':TEXTURES\TALKBUBBLE');
g_Texture_CreateWADEx('TEXTURE_PLAYER_INVULPENTA', GameWAD+':TEXTURES\PENTA');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_INDICATOR', GameWAD+':TEXTURES\PLRIND');
+
+ hasPBarGfx := true;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_LEFT', GameWAD+':TEXTURES\LLEFT') then hasPBarGfx := false;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_MARKER', GameWAD+':TEXTURES\LMARKER') then hasPBarGfx := false;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_MIDDLE', GameWAD+':TEXTURES\LMIDDLE') then hasPBarGfx := false;
+ if not g_Texture_CreateWADEx('UI_GFX_PBAR_RIGHT', GameWAD+':TEXTURES\LRIGHT') then hasPBarGfx := false;
+
+ if hasPBarGfx then
+ begin
+ g_Texture_GetSize('UI_GFX_PBAR_LEFT', wl, hl);
+ g_Texture_GetSize('UI_GFX_PBAR_RIGHT', wr, hr);
+ g_Texture_GetSize('UI_GFX_PBAR_MIDDLE', wb, hb);
+ g_Texture_GetSize('UI_GFX_PBAR_MARKER', wm, hm);
+ if (wl > 0) and (hl > 0) and (wr > 0) and (hr = hl) and (wb > 0) and (hb = hl) and (wm > 0) and (hm > 0) and (hm <= hl) then
+ begin
+ // yay!
+ end
+ else
+ begin
+ hasPBarGfx := false;
+ end;
+ end;
+
g_Frames_CreateWAD(nil, 'FRAMES_TELEPORT', GameWAD+':TEXTURES\TELEPORT', 64, 64, 10, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH', GameWAD+':WEAPONS\PUNCH', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_UP', GameWAD+':WEAPONS\PUNCH_UP', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_DN', GameWAD+':WEAPONS\PUNCH_DN', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_BERSERK', GameWAD+':WEAPONS\PUNCHB', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_BERSERK_UP', GameWAD+':WEAPONS\PUNCHB_UP', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_BERSERK_DN', GameWAD+':WEAPONS\PUNCHB_DN', 64, 64, 4, False);
g_Sound_CreateWADEx('SOUND_GAME_TELEPORT', GameWAD+':SOUNDS\TELEPORT');
g_Sound_CreateWADEx('SOUND_GAME_NOTELEPORT', GameWAD+':SOUNDS\NOTELEPORT');
+ g_Sound_CreateWADEx('SOUND_GAME_SECRET', GameWAD+':SOUNDS\SECRET');
g_Sound_CreateWADEx('SOUND_GAME_DOOROPEN', GameWAD+':SOUNDS\DOOROPEN');
g_Sound_CreateWADEx('SOUND_GAME_DOORCLOSE', GameWAD+':SOUNDS\DOORCLOSE');
g_Sound_CreateWADEx('SOUND_GAME_BULK1', GameWAD+':SOUNDS\BULK1');
g_Sound_CreateWADEx('SOUND_GAME_BULK2', GameWAD+':SOUNDS\BULK2');
g_Sound_CreateWADEx('SOUND_GAME_BUBBLE1', GameWAD+':SOUNDS\BUBBLE1');
g_Sound_CreateWADEx('SOUND_GAME_BUBBLE2', GameWAD+':SOUNDS\BUBBLE2');
+ g_Sound_CreateWADEx('SOUND_GAME_BURNING', GameWAD+':SOUNDS\BURNING');
g_Sound_CreateWADEx('SOUND_GAME_SWITCH1', GameWAD+':SOUNDS\SWITCH1');
g_Sound_CreateWADEx('SOUND_GAME_SWITCH0', GameWAD+':SOUNDS\SWITCH0');
g_Sound_CreateWADEx('SOUND_GAME_RADIO', GameWAD+':SOUNDS\RADIO');
g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL3X', GameWAD+':SOUNDS\KILL3X');
g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL4X', GameWAD+':SOUNDS\KILL4X');
g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILLMX', GameWAD+':SOUNDS\KILLMX');
+ g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA1', GameWAD+':SOUNDS\MUHAHA1');
+ g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA2', GameWAD+':SOUNDS\MUHAHA2');
+ g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA3', GameWAD+':SOUNDS\MUHAHA3');
+ g_Sound_CreateWADEx('SOUND_CTF_GET1', GameWAD+':SOUNDS\GETFLAG1');
+ g_Sound_CreateWADEx('SOUND_CTF_GET2', GameWAD+':SOUNDS\GETFLAG2');
+ g_Sound_CreateWADEx('SOUND_CTF_LOST1', GameWAD+':SOUNDS\LOSTFLG1');
+ g_Sound_CreateWADEx('SOUND_CTF_LOST2', GameWAD+':SOUNDS\LOSTFLG2');
+ g_Sound_CreateWADEx('SOUND_CTF_RETURN1', GameWAD+':SOUNDS\RETFLAG1');
+ g_Sound_CreateWADEx('SOUND_CTF_RETURN2', GameWAD+':SOUNDS\RETFLAG2');
+ g_Sound_CreateWADEx('SOUND_CTF_CAPTURE1', GameWAD+':SOUNDS\CAPFLAG1');
+ g_Sound_CreateWADEx('SOUND_CTF_CAPTURE2', GameWAD+':SOUNDS\CAPFLAG2');
goodsnd[0] := TPlayableSound.Create();
goodsnd[1] := TPlayableSound.Create();
killsnd[2].SetByName('SOUND_ANNOUNCER_KILL4X');
killsnd[3].SetByName('SOUND_ANNOUNCER_KILLMX');
+ hahasnd[0] := TPlayableSound.Create();
+ hahasnd[1] := TPlayableSound.Create();
+ hahasnd[2] := TPlayableSound.Create();
+
+ hahasnd[0].SetByName('SOUND_ANNOUNCER_MUHAHA1');
+ hahasnd[1].SetByName('SOUND_ANNOUNCER_MUHAHA2');
+ hahasnd[2].SetByName('SOUND_ANNOUNCER_MUHAHA3');
+
+ sound_get_flag[0] := TPlayableSound.Create();
+ sound_get_flag[1] := TPlayableSound.Create();
+ sound_lost_flag[0] := TPlayableSound.Create();
+ sound_lost_flag[1] := TPlayableSound.Create();
+ sound_ret_flag[0] := TPlayableSound.Create();
+ sound_ret_flag[1] := TPlayableSound.Create();
+ sound_cap_flag[0] := TPlayableSound.Create();
+ sound_cap_flag[1] := TPlayableSound.Create();
+
+ sound_get_flag[0].SetByName('SOUND_CTF_GET1');
+ sound_get_flag[1].SetByName('SOUND_CTF_GET2');
+ sound_lost_flag[0].SetByName('SOUND_CTF_LOST1');
+ sound_lost_flag[1].SetByName('SOUND_CTF_LOST2');
+ sound_ret_flag[0].SetByName('SOUND_CTF_RETURN1');
+ sound_ret_flag[1].SetByName('SOUND_CTF_RETURN2');
+ sound_cap_flag[0].SetByName('SOUND_CTF_CAPTURE1');
+ sound_cap_flag[1].SetByName('SOUND_CTF_CAPTURE2');
+
+ g_Game_LoadChatSounds(GameWAD+':CHATSND\SNDCFG');
+
g_Game_SetLoadingText(_lc[I_LOAD_ITEMS_DATA], 0, False);
g_Items_LoadData();
g_Weapon_FreeData();
g_Monsters_FreeData();
- e_WriteLog('Releasing game data...', MSG_NOTIFY);
+ e_WriteLog('Releasing game data...', TMsgType.Notify);
g_Texture_Delete('NOTEXTURE');
g_Texture_Delete('TEXTURE_PLAYER_HUD');
g_Texture_Delete('TEXTURE_PLAYER_TALKBUBBLE');
g_Texture_Delete('TEXTURE_PLAYER_INVULPENTA');
g_Frames_DeleteByName('FRAMES_TELEPORT');
+ g_Frames_DeleteByName('FRAMES_PUNCH');
+ g_Frames_DeleteByName('FRAMES_PUNCH_UP');
+ g_Frames_DeleteByName('FRAMES_PUNCH_DN');
+ g_Frames_DeleteByName('FRAMES_PUNCH_BERSERK');
+ g_Frames_DeleteByName('FRAMES_PUNCH_BERSERK_UP');
+ g_Frames_DeleteByName('FRAMES_PUNCH_BERSERK_DN');
g_Sound_Delete('SOUND_GAME_TELEPORT');
g_Sound_Delete('SOUND_GAME_NOTELEPORT');
+ g_Sound_Delete('SOUND_GAME_SECRET');
g_Sound_Delete('SOUND_GAME_DOOROPEN');
g_Sound_Delete('SOUND_GAME_DOORCLOSE');
g_Sound_Delete('SOUND_GAME_BULK1');
g_Sound_Delete('SOUND_GAME_BULK2');
g_Sound_Delete('SOUND_GAME_BUBBLE1');
g_Sound_Delete('SOUND_GAME_BUBBLE2');
+ g_Sound_Delete('SOUND_GAME_BURNING');
g_Sound_Delete('SOUND_GAME_SWITCH1');
g_Sound_Delete('SOUND_GAME_SWITCH0');
g_Sound_Delete('SOUND_ANNOUNCER_KILL4X');
g_Sound_Delete('SOUND_ANNOUNCER_KILLMX');
+ hahasnd[0].Free();
+ hahasnd[1].Free();
+ hahasnd[2].Free();
+
+ g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA1');
+ g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA2');
+ g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA3');
+
+ sound_get_flag[0].Free();
+ sound_get_flag[1].Free();
+ sound_lost_flag[0].Free();
+ sound_lost_flag[1].Free();
+ sound_ret_flag[0].Free();
+ sound_ret_flag[1].Free();
+ sound_cap_flag[0].Free();
+ sound_cap_flag[1].Free();
+
+ g_Sound_Delete('SOUND_CTF_GET1');
+ g_Sound_Delete('SOUND_CTF_GET2');
+ g_Sound_Delete('SOUND_CTF_LOST1');
+ g_Sound_Delete('SOUND_CTF_LOST2');
+ g_Sound_Delete('SOUND_CTF_RETURN1');
+ g_Sound_Delete('SOUND_CTF_RETURN2');
+ g_Sound_Delete('SOUND_CTF_CAPTURE1');
+ g_Sound_Delete('SOUND_CTF_CAPTURE2');
+
+ g_Game_FreeChatSounds();
+
DataLoaded := False;
end;
begin
e_TextureFontGetSize(gStdFont, ww2, hh2);
- e_PollInput();
- if e_KeyPressed(IK_TAB) then
+ sys_HandleInput;
+
+ if g_Console_Action(ACTION_SCORES) then
begin
if not gStatsPressed then
begin
gg := g;
bb := b;
end;
- e_TextureFontPrintEx(x+8, _y, Name, gStdFont, rr, gg, bb, 1);
- e_TextureFontPrintEx(x+w1+8, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
- e_TextureFontPrintEx(x+w1+w2+8, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
+ if (gPlayers[Num] <> nil) and (gPlayers[Num].FReady) then
+ e_TextureFontPrintEx(x+16, _y, Name + ' *', gStdFont, rr, gg, bb, 1)
+ else
+ e_TextureFontPrintEx(x+16, _y, Name, gStdFont, rr, gg, bb, 1);
+ e_TextureFontPrintEx(x+w1+16, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
+ e_TextureFontPrintEx(x+w1+w2+16, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
_y := _y+24;
end;
else
r := 255;
- e_TextureFontPrintEx(x+8+16+8, _y+4, Name, gStdFont, r, r, r, 1, True);
+ if (gPlayers[Num] <> nil) and (gPlayers[Num].FReady) then
+ e_TextureFontPrintEx(x+8+16+8, _y+4, Name + ' *', gStdFont, r, r, r, 1, True)
+ else
+ e_TextureFontPrintEx(x+8+16+8, _y+4, Name, gStdFont, r, r, r, 1, True);
e_TextureFontPrintEx(x+w1+8+16+8, _y+4, IntToStr(Frags), gStdFont, r, r, r, 1, True);
e_TextureFontPrintEx(x+w1+w2+8+16+8, _y+4, IntToStr(Deaths), gStdFont, r, r, r, 1, True);
_y := _y+24;
end;
end;
+
+ // HACK: take stats screenshot immediately after the first frame of the stats showing
+ if gScreenshotStats and not StatShotDone then
+ begin
+ g_TakeScreenShot('stats/' + StatFilename, True);
+ StatShotDone := True;
+ end;
end;
procedure DrawSingleStat();
end;
procedure DrawLoadingStat();
-var
- ww, hh: Word;
- xx, yy, i: Integer;
- s: String;
-begin
- if Length(LoadingStat.Msgs) = 0 then
- Exit;
-
+ procedure drawRect (x, y, w, h: Integer);
+ begin
+ if (w < 1) or (h < 1) then exit;
+ glBegin(GL_QUADS);
+ glVertex2f(x+0.375, y+0.375);
+ glVertex2f(x+w+0.375, y+0.375);
+ glVertex2f(x+w+0.375, y+h+0.375);
+ glVertex2f(x+0.375, y+h+0.375);
+ glEnd();
+ end;
+
+ function drawPBar (cur, total: Integer; washere: Boolean): Boolean;
+ var
+ rectW, rectH: Integer;
+ x0, y0: Integer;
+ wdt: Integer;
+ wl, hl: Integer;
+ wr, hr: Integer;
+ wb, hb: Integer;
+ wm, hm: Integer;
+ idl, idr, idb, idm: LongWord;
+ f, my: Integer;
+ begin
+ result := false;
+ if (total < 1) then exit;
+ if (cur < 1) then exit; // don't blink
+ if (not washere) and (cur >= total) then exit; // don't blink
+ //if (cur < 0) then cur := 0;
+ //if (cur > total) then cur := total;
+ result := true;
+
+ if (hasPBarGfx) then
+ begin
+ g_Texture_Get('UI_GFX_PBAR_LEFT', idl);
+ g_Texture_GetSize('UI_GFX_PBAR_LEFT', wl, hl);
+ g_Texture_Get('UI_GFX_PBAR_RIGHT', idr);
+ g_Texture_GetSize('UI_GFX_PBAR_RIGHT', wr, hr);
+ g_Texture_Get('UI_GFX_PBAR_MIDDLE', idb);
+ g_Texture_GetSize('UI_GFX_PBAR_MIDDLE', wb, hb);
+ g_Texture_Get('UI_GFX_PBAR_MARKER', idm);
+ g_Texture_GetSize('UI_GFX_PBAR_MARKER', wm, hm);
+
+ //rectW := gScreenWidth-360;
+ rectW := trunc(624.0*gScreenWidth/1024.0);
+ rectH := hl;
+
+ x0 := (gScreenWidth-rectW) div 2;
+ y0 := gScreenHeight-rectH-64;
+ if (y0 < 2) then y0 := 2;
+
+ glEnable(GL_SCISSOR_TEST);
+
+ // left and right
+ glScissor(x0, gScreenHeight-y0-rectH, rectW, rectH);
+ e_DrawSize(idl, x0, y0, 0, true, false, wl, hl);
+ e_DrawSize(idr, x0+rectW-wr, y0, 0, true, false, wr, hr);
+
+ // body
+ glScissor(x0+wl, gScreenHeight-y0-rectH, rectW-wl-wr, rectH);
+ f := x0+wl;
+ while (f < x0+rectW) do
+ begin
+ e_DrawSize(idb, f, y0, 0, true, false, wb, hb);
+ f += wb;
+ end;
+
+ // filled part
+ wdt := (rectW-wl-wr)*cur div total;
+ if (wdt > rectW-wl-wr) then wdt := rectW-wr-wr;
+ if (wdt > 0) then
+ begin
+ my := y0; // don't be so smart, ketmar: +(rectH-wm) div 2;
+ glScissor(x0+wl, gScreenHeight-my-rectH, wdt, hm);
+ f := x0+wl;
+ while (wdt > 0) do
+ begin
+ e_DrawSize(idm, f, y0, 0, true, false, wm, hm);
+ f += wm;
+ wdt -= wm;
+ end;
+ end;
+
+ glScissor(0, 0, gScreenWidth, gScreenHeight);
+ end
+ else
+ begin
+ rectW := gScreenWidth-64;
+ rectH := 16;
+
+ x0 := (gScreenWidth-rectW) div 2;
+ y0 := gScreenHeight-rectH-64;
+ if (y0 < 2) then y0 := 2;
+
+ glDisable(GL_BLEND);
+ glDisable(GL_TEXTURE_2D);
+
+ //glClearColor(0, 0, 0, 0);
+ //glClear(GL_COLOR_BUFFER_BIT);
+
+ glColor4ub(127, 127, 127, 255);
+ drawRect(x0-2, y0-2, rectW+4, rectH+4);
+
+ glColor4ub(0, 0, 0, 255);
+ drawRect(x0-1, y0-1, rectW+2, rectH+2);
+
+ glColor4ub(127, 127, 127, 255);
+ wdt := rectW*cur div total;
+ if (wdt > rectW) then wdt := rectW;
+ drawRect(x0, y0, wdt, rectH);
+ end;
+ end;
+
+var
+ ww, hh: Word;
+ xx, yy, i: Integer;
+ s: String;
+begin
+ if (Length(LoadingStat.Msgs) = 0) then exit;
+
e_CharFont_GetSize(gMenuFont, _lc[I_MENU_LOADING], ww, hh);
yy := (gScreenHeight div 3);
e_CharFont_Print(gMenuFont, (gScreenWidth div 2)-(ww div 2), yy-2*hh, _lc[I_MENU_LOADING]);
xx := (gScreenWidth div 3);
with LoadingStat do
+ begin
for i := 0 to NextMsg-1 do
- begin
- if (i = (NextMsg-1)) and (MaxValue > 0) then
- s := Format('%s: %d/%d', [Msgs[i], CurValue, MaxValue])
- else
- s := Msgs[i];
+ begin
+ if (i = (NextMsg-1)) and (MaxValue > 0) then
+ s := Format('%s: %d/%d', [Msgs[i], CurValue, MaxValue])
+ else
+ s := Msgs[i];
- e_CharFont_PrintEx(gMenuSmallFont, xx, yy, s, _RGB(255, 0, 0));
- yy := yy + LOADING_INTERLINE;
- end;
+ e_CharFont_PrintEx(gMenuSmallFont, xx, yy, s, _RGB(255, 0, 0));
+ yy := yy + LOADING_INTERLINE;
+ PBarWasHere := drawPBar(CurValue, MaxValue, PBarWasHere);
+ end;
+ end;
+end;
+
+procedure DrawMenuBackground(tex: AnsiString);
+var
+ w, h: Word;
+ ID: DWord;
+
+begin
+ if g_Texture_Get(tex, ID) then
+ begin
+ e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+ e_GetTextureSize(ID, @w, @h);
+ if w = h then
+ w := round(w * 1.333 * (gScreenHeight / h))
+ else
+ w := trunc(w * (gScreenHeight / h));
+ e_DrawSize(ID, (gScreenWidth - w) div 2, 0, 0, False, False, w, gScreenHeight);
+ end
+ else e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
end;
procedure DrawMinimap(p: TPlayer; RenderRect: e_graphics.TRect);
var
a, aX, aY, aX2, aY2, Scale, ScaleSz: Integer;
- function monDraw (monidx: Integer; mon: TMonster): Boolean;
+ function monDraw (mon: TMonster): Boolean;
begin
result := false; // don't stop
with mon do
begin
- if Live then
+ if alive then
begin
// Ëåâûé âåðõíèé óãîë
aX := Obj.X div ScaleSz + 1;
aY2 := aY + aY2 - 1;
case LiftType of
- 0: e_DrawFillQuad(aX, aY, aX2, aY2, 116, 72, 36, 0);
- 1: e_DrawFillQuad(aX, aY, aX2, aY2, 116, 124, 96, 0);
- 2: e_DrawFillQuad(aX, aY, aX2, aY2, 200, 80, 4, 0);
- 3: e_DrawFillQuad(aX, aY, aX2, aY2, 252, 140, 56, 0);
+ LIFTTYPE_UP: e_DrawFillQuad(aX, aY, aX2, aY2, 116, 72, 36, 0);
+ LIFTTYPE_DOWN: e_DrawFillQuad(aX, aY, aX2, aY2, 116, 124, 96, 0);
+ LIFTTYPE_LEFT: e_DrawFillQuad(aX, aY, aX2, aY2, 200, 80, 4, 0);
+ LIFTTYPE_RIGHT: e_DrawFillQuad(aX, aY, aX2, aY2, 252, 140, 56, 0);
end;
end;
end;
// Ðèñóåì èãðîêîâ:
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;
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);
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);
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;
begin
- profileFrameDraw.sectionBegin(profname);
+ if (profileFrameDraw <> nil) then profileFrameDraw.sectionBegin(profname);
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();
+ 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
+ //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, ')');
- if (setTransMatrix) then glTranslatef(transX, transY, 0);
- 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
g_Player_DrawHealth();
end;
- profileFrameDraw.mainEnd(); // map rendering
+ if (profileFrameDraw <> nil) then profileFrameDraw.mainEnd(); // map rendering
end;
sWidth := w;
sHeight := h;
- renderMapInternal(-bx, -by, -x, -y, true);
+ fixViewportForScale();
+ renderMapInternal(-bx, -by, true);
glPopMatrix();
end;
procedure DrawPlayer(p: TPlayer);
var
- px, py, a, b, c, d: Integer;
+ px, py, a, b, c, d, i: Integer;
//R: TRect;
-
begin
if (p = nil) or (p.FDummy) then
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;
glPushMatrix();
px := p.GameX + PLAYER_RECT_CX;
- py := p.GameY + PLAYER_RECT_CY;
+ py := p.GameY + PLAYER_RECT_CY+p.Obj.slopeUpLeft;
+
+ if (g_dbg_scale = 1.0) and (not g_dbg_ignore_bounds) 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 > (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;
- if gMapInfo.Height <= gPlayerScreenSize.Y then b := 0;
+ 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
+ // scaled, ignore level bounds
+ a := -px+(gPlayerScreenSize.X div 2);
+ b := -py+(gPlayerScreenSize.Y div 2);
+ end;
if p.IncCam <> 0 then
begin
//glTranslatef(a, b+p.IncCam, 0);
- renderMapInternal(-c, -d, a, b+p.IncCam, true);
+ //if (p = gPlayer1) and (g_dbg_scale >= 1.0) then g_Holmes_plrViewSize(sWidth, sHeight);
+
+ //conwritefln('OLD: (%s,%s)-(%s,%s)', [sX, sY, sWidth, sHeight]);
+ fixViewportForScale();
+ //conwritefln(' (%s,%s)-(%s,%s)', [sX, sY, sWidth, sHeight]);
+
+ if (g_dbg_scale <> 1.0) and (not g_dbg_ignore_bounds) then
+ begin
+ if (sX+sWidth > gMapInfo.Width) then sX := gMapInfo.Width-sWidth;
+ if (sY+sHeight > gMapInfo.Height) then sY := gMapInfo.Height-sHeight;
+ if (sX < 0) then sX := 0;
+ if (sY < 0) then sY := 0;
+
+ if (gBackSize.X <= gPlayerScreenSize.X) or (gMapInfo.Width <= sWidth) then c := 0 else c := trunc((gBackSize.X-gPlayerScreenSize.X)*sX/(gMapInfo.Width-sWidth));
+ if (gBackSize.Y <= gPlayerScreenSize.Y) or (gMapInfo.Height <= sHeight) then d := 0 else d := trunc((gBackSize.Y-gPlayerScreenSize.Y)*sY/(gMapInfo.Height-sHeight));
+ end;
+
+ //r_smallmap_h: 0: left; 1: center; 2: right
+ //r_smallmap_v: 0: top; 1: center; 2: bottom
+ // horiz small map?
+ if (gMapInfo.Width = sWidth) then
+ begin
+ sX := 0;
+ end
+ else if (gMapInfo.Width < sWidth) then
+ begin
+ case r_smallmap_h of
+ 1: sX := -((sWidth-gMapInfo.Width) div 2); // center
+ 2: sX := -(sWidth-gMapInfo.Width); // right
+ else sX := 0; // left
+ end;
+ end;
+ // vert small map?
+ if (gMapInfo.Height = sHeight) then
+ begin
+ sY := 0;
+ end
+ else if (gMapInfo.Height < sHeight) then
+ begin
+ case r_smallmap_v of
+ 1: sY := -((sHeight-gMapInfo.Height) div 2); // center
+ 2: sY := -(sHeight-gMapInfo.Height); // bottom
+ else sY := 0; // top
+ end;
+ end;
+
+ p.viewPortX := sX;
+ p.viewPortY := sY;
+ 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);
+
+ if (gGameSettings.GameMode <> GM_SINGLE) and (gPlayerIndicator > 0) then
+ case gPlayerIndicator of
+ 1:
+ p.DrawIndicator(_RGB(255, 255, 255));
+
+ 2:
+ for i := 0 to High(gPlayers) do
+ if gPlayers[i] <> nil then
+ if gPlayers[i] = p then p.DrawIndicator(_RGB(255, 255, 255))
+ else if (gPlayers[i].Team = p.Team) and (gPlayers[i].Team <> TEAM_NONE) then
+ if gPlayerIndicatorStyle = 1 then
+ gPlayers[i].DrawIndicator(_RGB(192, 192, 192))
+ else gPlayers[i].DrawIndicator(gPlayers[i].GetColor);
+ end;
if p.FSpectator then
e_TextureFontPrintEx(p.GameX + PLAYER_RECT_CX - 4,
procedure drawProfilers ();
var
px: Integer = -1;
+ py: Integer = -1;
begin
- if g_profile_frame_draw then px := px-drawProfiles(px, -1, profileFrameDraw);
- if g_profile_collision then px := px-drawProfiles(px, -1, profMapCollision);
+ 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();
begin
if gExit = EXIT_QUIT then Exit;
- Time := GetTimer() {div 1000};
+ Time := sys_GetTicks() {div 1000};
FPSCounter := FPSCounter+1;
if Time - FPSTime >= 1000 then
begin
if plView1 <> nil then
begin
gHearPoint1.Active := True;
- gHearPoint1.Coords.X := plView1.GameX;
- gHearPoint1.Coords.Y := plView1.GameY;
+ gHearPoint1.Coords.X := plView1.GameX + PLAYER_RECT.Width;
+ gHearPoint1.Coords.Y := plView1.GameY + PLAYER_RECT.Height DIV 2;
end else
gHearPoint1.Active := False;
if plView2 <> nil then
begin
gHearPoint2.Active := True;
- gHearPoint2.Coords.X := plView2.GameX;
- gHearPoint2.Coords.Y := plView2.GameY;
+ gHearPoint2.Coords.X := plView2.GameX + PLAYER_RECT.Width;
+ gHearPoint2.Coords.Y := plView2.GameY + PLAYER_RECT.Height DIV 2;
end else
gHearPoint2.Active := False;
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
w := 0;
if IsDrawStat or (gSpectMode = 1) then DrawStat();
- if gSpectHUD and (not gChatShow) and (gSpectMode <> SPECT_NONE) then
+ if gSpectHUD and (not gChatShow) and (gSpectMode <> SPECT_NONE) and (not gSpectAuto) then
begin
// Draw spectator GUI
ww := 0;
e_TextureFontPrintEx(0, gScreenHeight - (hh+2)*2, 'MODE: Watch Players', gStdFont, 255, 255, 255, 1);
end;
e_TextureFontPrintEx(2*ww, gScreenHeight - (hh+2), '< jump >', gStdFont, 255, 255, 255, 1);
+ if gSpectMode = SPECT_STATS then
+ begin
+ e_TextureFontPrintEx(16*ww, gScreenHeight - (hh+2)*2, 'Autoview', gStdFont, 255, 255, 255, 1);
+ e_TextureFontPrintEx(16*ww, gScreenHeight - (hh+2), '< fire >', gStdFont, 255, 255, 255, 1);
+ end;
if gSpectMode = SPECT_MAPVIEW then
begin
e_TextureFontPrintEx(22*ww, gScreenHeight - (hh+2)*2, '[-]', gStdFont, 255, 255, 255, 1);
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),
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 DrawMenuBackground('MENU_BACKGROUND');
+ // 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
- 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);
+ // 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;
- if g_ActiveWindow <> nil then
- e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
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
else
back := 'INTER';
- if g_Texture_Get(back, ID) then
- e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
- else
- e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+ DrawMenuBackground(back);
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';
- if g_Texture_Get(back, ID) then
- e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
- else
- e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+ DrawMenuBackground(back);
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;
if gState = STATE_ENDPIC then
begin
ID := DWORD(-1);
- if not g_Texture_Get('TEXTURE_endpic', ID) then
- g_Texture_Get(_lc[I_TEXTURE_ENDPIC], ID);
-
- if ID <> DWORD(-1) then
- e_DrawSize(ID, 0, 0, 0, False, False, gScreenWidth, gScreenHeight)
- else
- e_Clear(GL_COLOR_BUFFER_BIT, 0, 0, 0);
+ if g_Texture_Get('TEXTURE_endpic', ID) then DrawMenuBackground('TEXTURE_endpic')
+ else DrawMenuBackground(_lc[I_TEXTURE_ENDPIC]);
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
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);
- end;
- g_Serverlist_Draw(slCurrent);
+// 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);
+// end;
+ DrawMenuBackground('MENU_BACKGROUND');
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
+ g_Serverlist_Draw(slCurrent, slTable);
end;
end;
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;
+{$IFNDEF HEADLESS}
g_Console_Draw();
+{$ENDIF}
if g_debug_Sounds and gGameOn then
begin
e_TextureFontPrint(0, 16, Format('UPS: %d', [UPS]), gStdFont);
end;
- if gGameOn and gShowTime and (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT]) then
- e_TextureFontPrint(gScreenWidth-72, 0,
- Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]),
- gStdFont);
+ if gGameOn and gShowTime then
+ drawTime(gScreenWidth-72, gScreenHeight-16);
if gGameOn then drawProfilers();
+
+{$IFDEF ENABLE_HOLMES}
+ g_Holmes_DrawUI();
+{$ENDIF}
+
+ g_Touch_Draw;
end;
procedure g_Game_Quit();
begin
g_Game_StopAllSounds(True);
gMusic.Free();
- g_Game_SaveOptions();
g_Game_FreeData();
g_PlayerModel_FreeData();
g_Texture_DeleteAll();
g_Frames_DeleteAll();
- g_Menu_Free();
+{$IFNDEF HEADLESS}
+ //g_Menu_Free(); //k8: this segfaults after resolution change; who cares?
+{$ENDIF}
if NetInitDone then g_Net_Free;
g_Game_DeleteTestMap();
gExit := EXIT_QUIT;
- PushExitEvent();
+ sys_RequestQuit;
end;
procedure g_FatalError(Text: String);
begin
g_Console_Add(Format(_lc[I_FATAL_ERROR], [Text]), True);
- e_WriteLog(Format(_lc[I_FATAL_ERROR], [Text]), MSG_WARNING);
+ e_WriteLog(Format(_lc[I_FATAL_ERROR], [Text]), TMsgType.Warning);
gExit := EXIT_SIMPLE;
end;
procedure g_SimpleError(Text: String);
begin
g_Console_Add(Format(_lc[I_SIMPLE_ERROR], [Text]), True);
- e_WriteLog(Format(_lc[I_SIMPLE_ERROR], [Text]), MSG_WARNING);
+ e_WriteLog(Format(_lc[I_SIMPLE_ERROR], [Text]), TMsgType.Warning);
end;
procedure g_Game_SetupScreenSize();
+const
+ RES_FACTOR = 4.0 / 3.0;
var
- d: Single;
+ s: Single;
+ rf: Single;
+ bw, bh: Word;
begin
// Ðàçìåð ýêðàíîâ èãðîêîâ:
gPlayerScreenSize.X := gScreenWidth-196;
// Ðàçìåð çàäíåãî ïëàíà:
if BackID <> DWORD(-1) then
begin
- d := SKY_STRETCH;
-
- if (gScreenWidth*d > gMapInfo.Width) or
- (gScreenHeight*d > gMapInfo.Height) then
- d := 1.0;
-
- gBackSize.X := Round(gScreenWidth*d);
- gBackSize.Y := Round(gScreenHeight*d);
+ s := SKY_STRETCH;
+ if (gScreenWidth*s > gMapInfo.Width) or
+ (gScreenHeight*s > gMapInfo.Height) then
+ begin
+ gBackSize.X := gScreenWidth;
+ gBackSize.Y := gScreenHeight;
+ end
+ else
+ begin
+ e_GetTextureSize(BackID, @bw, @bh);
+ rf := Single(bw) / Single(bh);
+ if (rf > RES_FACTOR) then bw := Round(Single(bh) * RES_FACTOR)
+ else if (rf < RES_FACTOR) then bh := Round(Single(bw) / RES_FACTOR);
+ s := Max(gScreenWidth / bw, gScreenHeight / bh);
+ if (s < 1.0) then s := 1.0;
+ gBackSize.X := Round(bw*s);
+ gBackSize.Y := Round(bh*s);
+ end;
end;
end;
procedure g_Game_ChangeResolution(newWidth, newHeight: Word; nowFull, nowMax: Boolean);
begin
- g_Window_SetSize(newWidth, newHeight, nowFull);
+ sys_SetDisplayMode(newWidth, newHeight, gBPP, nowFull, nowMax);
end;
procedure g_Game_AddPlayer(Team: Byte = TEAM_NONE);
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_PlayerCreate(gPlayer1.UID);
gPlayer1.Respawn(False, True);
-
- if g_Game_IsNet and NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerComes();
end;
Exit;
if g_Game_IsServer and g_Game_IsNet then
MH_SEND_PlayerCreate(gPlayer2.UID);
gPlayer2.Respawn(False, True);
-
- if g_Game_IsNet and NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerComes();
end;
Exit;
Pl.Kill(K_SIMPLEKILL, 0, HIT_DISCON);
g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
g_Player_Remove(Pl.UID);
-
- if g_Game_IsNet and NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end else
gPlayer2 := nil;
Exit;
Pl.Kill(K_SIMPLEKILL, 0, HIT_DISCON);
g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [Pl.Name]), True);
g_Player_Remove(Pl.UID);
-
- if g_Game_IsNet and NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end else
begin
gPlayer1 := nil;
end;
Exit;
end;
+ g_Net_Slist_ServerPlayerLeaves();
end;
procedure g_Game_Spectate();
procedure g_Game_StartSingle(Map: String; TwoPlayers: Boolean; nPlayers: Byte);
var
i, nPl: Integer;
+ tmps: AnsiString;
begin
g_Game_Free();
- e_WriteLog('Starting singleplayer game...', MSG_NOTIFY);
+ e_WriteLog('Starting singleplayer game...', TMsgType.Notify);
g_Game_ClearLoading();
end;
// Çàãðóçêà è çàïóñê êàðòû:
- if not g_Game_StartMap(MAP, True) then
+ if not g_Game_StartMap(false{asMegawad}, MAP, True) then
begin
- g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [gGameSettings.WAD + ':\' + MAP]));
+ if (Pos(':\', Map) > 0) or (Pos(':/', Map) > 0) then tmps := Map else tmps := gGameSettings.WAD + ':\' + MAP;
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [tmps]));
Exit;
end;
begin
g_Game_Free();
- e_WriteLog('Starting custom game...', MSG_NOTIFY);
+ e_WriteLog('Starting custom game...', TMsgType.Notify);
g_Game_ClearLoading();
end;
// Çàãðóçêà è çàïóñê êàðòû:
- if not g_Game_StartMap(Map, True) then
+ if not g_Game_StartMap(true{asMegawad}, Map, True) then
begin
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Map]));
Exit;
IPAddr: LongWord; Port: Word);
begin
g_Game_Free();
+ g_Net_Slist_ServerClosed();
- e_WriteLog('Starting net game (server)...', MSG_NOTIFY);
+ e_WriteLog('Starting net game (server)...', TMsgType.Notify);
g_Game_ClearLoading();
gPlayer2.Name := gPlayer2Settings.Name;
end;
+ g_Game_SetLoadingText(_lc[I_LOAD_HOST], 0, False);
+ if NetForwardPorts then
+ g_Game_SetLoadingText(_lc[I_LOAD_PORTS], 0, False);
+
// Ñòàðòóåì ñåðâåð
if not g_Net_Host(IPAddr, Port, NetMaxClients) then
begin
Exit;
end;
- g_Net_Slist_Set(NetSlistIP, NetSlistPort);
+ g_Net_Slist_Set(NetSlistIP, NetSlistPort, NetSlistList);
+
+ g_Net_Slist_ServerStarted();
// Çàãðóçêà è çàïóñê êàðòû:
- if not g_Game_StartMap(Map, True) then
+ if not g_Game_StartMap(false{asMegawad}, Map, True) then
begin
+ g_Net_Slist_ServerClosed();
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [Map]));
Exit;
end;
g_Map_GetPointCount(RESPAWNPOINT_RED)+
g_Map_GetPointCount(RESPAWNPOINT_BLUE)) < 1 then
begin
+ g_Net_Slist_ServerClosed();
g_FatalError(_lc[I_GAME_ERROR_GET_SPAWN]);
Exit;
end;
// Íàñòðîéêè èãðîêîâ è áîòîâ:
g_Player_Init();
+ g_Net_Slist_ServerMapStarted();
NetState := NET_STATE_GAME;
end;
g_Game_Free();
State := 0;
- e_WriteLog('Starting net game (client)...', MSG_NOTIFY);
- e_WriteLog('NET: Trying to connect to ' + Addr + ':' + IntToStr(Port) + '...', MSG_NOTIFY);
+ e_WriteLog('Starting net game (client)...', TMsgType.Notify);
+ e_WriteLog('NET: Trying to connect to ' + Addr + ':' + IntToStr(Port) + '...', TMsgType.Notify);
g_Game_ClearLoading();
NetState := NET_STATE_AUTH;
g_Game_SetLoadingText(_lc[I_LOAD_CONNECT], 0, False);
+
+ // create (or update) map/resource databases
+ g_Res_CreateDatabases(true);
+
// Ñòàðòóåì êëèåíò
if not g_Net_Connect(Addr, Port) then
begin
OuterLoop := True;
while OuterLoop do
begin
- while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
+ // fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html
+ // tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure.
+ // thank you, enet. let's ignore failures altogether then.
+ while (enet_host_service(NetHost, @NetEvent, 50) > 0) do
begin
if (NetEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
begin
+ if (NetEvent.channelID = NET_CHAN_DOWNLOAD_EX) then
+ begin
+ // ignore all download packets, they're processed by separate code
+ enet_packet_destroy(NetEvent.packet);
+ continue;
+ end;
Ptr := NetEvent.packet^.data;
if not InMsg.Init(Ptr, NetEvent.packet^.dataLength, True) then
+ begin
+ enet_packet_destroy(NetEvent.packet);
continue;
+ end;
+ InMsg.ReadLongWord(); // skip size
MID := InMsg.ReadByte();
if (MID = NET_MSG_INFO) and (State = 0) then
gGameSettings.Options := InMsg.ReadLongWord();
T := InMsg.ReadLongWord();
- newResPath := g_Res_SearchSameWAD(MapsDir, WadName, gWADHash);
- if newResPath = '' then
+ //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);
+ //g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
+ newResPath := g_Res_DownloadMapWAD(ExtractFileName(WadName), gWADHash);
if newResPath = '' then
begin
g_FatalError(_lc[I_NET_ERR_HASH]);
NetState := NET_STATE_NONE;
Exit;
end;
+ e_LogWritefln('using downloaded map wad [%s] for [%s]`', [newResPath, WadName], TMsgType.Notify);
end;
- newResPath := ExtractRelativePath(MapsDir, newResPath);
+ //newResPath := ExtractRelativePath(MapsDir, newResPath);
+
gPlayer1 := g_Player_Get(g_Player_Create(gPlayer1Settings.Model,
gPlayer1Settings.Color,
gPlayer1.UID := NetPlrUID1;
gPlayer1.Reset(True);
- if not g_Game_StartMap(newResPath + ':\' + Map, True) then
+ if not g_Game_StartMap(false{asMegawad}, newResPath + ':\' + Map, True) then
begin
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [WadName + ':\' + Map]));
enet_packet_destroy(NetEvent.packet);
end
else
+ begin
if (NetEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
begin
State := 0;
OuterLoop := False;
Break;
end;
+ end;
end;
- ProcessLoading();
+ ProcessLoading(true);
- e_PollInput();
-
- if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) then
+ if g_Net_UserRequestExit() then
begin
State := 0;
break;
g_Player_Init();
NetState := NET_STATE_GAME;
MC_SEND_FullStateRequest;
- e_WriteLog('NET: Connection successful.', MSG_NOTIFY);
+ e_WriteLog('NET: Connection successful.', TMsgType.Notify);
end;
-procedure g_Game_SaveOptions();
-begin
- g_Options_Write_Video(GameDir+'/'+CONFIG_FILENAME);
-end;
+var
+ lastAsMegaWad: Boolean = false;
-procedure g_Game_ChangeMap(MapPath: String);
+procedure g_Game_ChangeMap(const MapPath: String);
var
Force: Boolean;
begin
Force := False;
gExitByTrigger := False;
end;
- if not g_Game_StartMap(MapPath, Force) then
+ if not g_Game_StartMap(lastAsMegaWad, MapPath, Force) then
g_FatalError(Format(_lc[I_GAME_ERROR_MAP_LOAD], [MapPath]));
end;
if g_Game_IsClient then
Exit;
map := g_ExtractFileName(gMapInfo.Map);
+ e_LogWritefln('g_Game_Restart: map = "%s" gCurrentMapFileName = "%s"', [map, gCurrentMapFileName]);
MessageTime := 0;
gGameOn := False;
g_Game_ClearLoading();
- g_Game_StartMap(Map, True);
+ g_Game_StartMap(lastAsMegaWad, Map, True, gCurrentMapFileName);
end;
-function g_Game_StartMap(Map: String; Force: Boolean = False): Boolean;
+function g_Game_StartMap (asMegawad: Boolean; Map: String; Force: Boolean = False; const oldMapPath: AnsiString=''): Boolean;
var
NewWAD, ResName: String;
I: Integer;
+ nws: AnsiString;
begin
- g_Map_Free();
+ g_Map_Free((Map <> gCurrentMapFileName) and (oldMapPath <> gCurrentMapFileName));
g_Player_RemoveAllCorpses();
if (not g_Game_IsClient) and
g_Player_ResetTeams();
- if Pos(':\', Map) > 0 then
+ lastAsMegaWad := asMegawad;
+ if isWadPath(Map) then
begin
NewWAD := g_ExtractWadName(Map);
ResName := g_ExtractFileName(Map);
if g_Game_IsServer then
begin
- gWADHash := MD5File(MapsDir + NewWAD);
- g_Game_LoadWAD(NewWAD);
- end else
- // hash recieved in MC_RECV_GameEvent -> NET_EV_MAPSTART
- g_Game_ClientWAD(NewWAD, gWADHash);
- end else
+ nws := findDiskWad(NewWAD);
+ //writeln('000: Map=[', Map, ']; nws=[', nws, ']; NewWAD=[', NewWAD, ']');
+ if (asMegawad) then
+ begin
+ if (length(nws) = 0) then nws := e_FindWad(MegawadDirs, NewWAD);
+ if (length(nws) = 0) then nws := e_FindWad(MapDirs, NewWAD);
+ end
+ else
+ begin
+ if (length(nws) = 0) then nws := e_FindWad(MapDirs, NewWAD);
+ if (length(nws) = 0) then nws := e_FindWad(MegawadDirs, NewWAD);
+ end;
+ //if (length(nws) = 0) then nws := e_FindWad(MapDownloadDirs, NewWAD);
+ //writeln('001: Map=[', Map, ']; nws=[', nws, ']; NewWAD=[', NewWAD, ']');
+ //nws := NewWAD;
+ if (length(nws) = 0) then
+ begin
+ ResName := ''; // failed
+ end
+ else
+ begin
+ NewWAD := nws;
+ if (g_Game_IsNet) then gWADHash := MD5File(nws);
+ //writeln('********: nws=', nws, ' : Map=', Map, ' : nw=', NewWAD, ' : resname=', ResName);
+ g_Game_LoadWAD(NewWAD);
+ end;
+ end
+ else
+ begin
+ // hash received in MC_RECV_GameEvent -> NET_EV_MAPSTART
+ NewWAD := g_Game_ClientWAD(NewWAD, gWADHash);
+ end;
+ end
+ else
+ begin
+ NewWAD := gGameSettings.WAD;
ResName := Map;
+ end;
- Result := g_Map_Load(MapsDir + gGameSettings.WAD + ':\' + ResName);
+ //writeln('********: gsw=', gGameSettings.WAD, '; rn=', ResName);
+ result := false;
+ if (ResName <> '') and (NewWAD <> '') then
+ begin
+ //result := g_Map_Load(gGameSettings.WAD + ':\' + ResName);
+ result := g_Map_Load(NewWAD+':\'+ResName);
+ end;
if Result then
begin
g_Player_ResetAll(Force or gLastMap, gGameSettings.GameType = GT_SINGLE);
end;
gExit := 0;
- gPause := False;
+ gPauseMain := false;
+ gPauseHolmes := false;
gTime := 0;
NetTimeToUpdate := 1;
NetTimeToReliable := 0;
MH_SEND_GameEvent(NET_EV_MAPSTART, gGameSettings.GameMode, Map);
// Ìàñòåðñåðâåð
- if NetUseMaster 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]);
-
- g_Net_Slist_Update;
- end;
+ g_Net_Slist_ServerMapStarted();
if NetClients <> nil then
for I := 0 to High(NetClients) do
g_Game_ExecuteEvent('onmapstart');
end;
-procedure SetFirstLevel();
+procedure SetFirstLevel;
begin
gNextMap := '';
- MapList := g_Map_GetMapsList(MapsDir + gGameSettings.WAD);
+ MapList := g_Map_GetMapsList(gGameSettings.WAD);
if MapList = nil then
Exit;
MapList := nil;
end;
-procedure g_Game_ExitLevel(Map: Char16);
+procedure g_Game_ExitLevel(const Map: AnsiString);
begin
gNextMap := Map;
if gGameSettings.GameMode = GM_COOP then
g_Player_RememberAll;
- if not g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + gNextMap) then
+ if not g_Map_Exist(gGameSettings.WAD + ':\' + gNextMap) then
begin
gLastMap := True;
if gGameSettings.GameMode = GM_COOP then
gStatsPressed := True;
gNextMap := 'MAP01';
- if not g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + gNextMap) then
+ if not g_Map_Exist(gGameSettings.WAD + ':\' + gNextMap) then
g_Game_NextLevel;
if g_Game_IsNet then
gNextMap := Map;
end;
-procedure g_Game_ClientWAD(NewWAD: String; WHash: TMD5Digest);
+function g_Game_ClientWAD (NewWAD: String; const WHash: TMD5Digest): AnsiString;
var
- gWAD: String;
+ gWAD{, xwad}: String;
begin
- if LowerCase(NewWAD) = LowerCase(gGameSettings.WAD) then
- Exit;
- if not g_Game_IsClient then
+ result := NewWAD;
+ if not g_Game_IsClient then Exit;
+ //e_LogWritefln('*** g_Game_ClientWAD: `%s`', [NewWAD]);
+
+ gWAD := g_Res_DownloadMapWAD(ExtractFileName(NewWAD), WHash);
+ if gWAD = '' then
+ begin
+ result := '';
+ g_Game_Free();
+ g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [ExtractFileName(NewWAD)]));
Exit;
+ end;
+
+ e_LogWritefln('using downloaded client map wad [%s] for [%s]', [gWAD, NewWAD], TMsgType.Notify);
+ NewWAD := gWAD;
+
+ g_Game_LoadWAD(NewWAD);
+ result := NewWAD;
+
+ {
+ if LowerCase(NewWAD) = LowerCase(gGameSettings.WAD) then Exit;
gWAD := g_Res_SearchSameWAD(MapsDir, ExtractFileName(NewWAD), WHash);
if gWAD = '' then
begin
g_Game_SetLoadingText(_lc[I_LOAD_DL_RES], 0, False);
- gWAD := g_Res_DownloadWAD(ExtractFileName(NewWAD));
+ gWAD := g_Res_DownloadMapWAD(ExtractFileName(NewWAD), WHash);
if gWAD = '' then
begin
g_Game_Free();
end;
NewWAD := ExtractRelativePath(MapsDir, gWAD);
g_Game_LoadWAD(NewWAD);
+ }
end;
procedure g_Game_RestartRound(NoMapRestart: Boolean = False);
var
i, n, nb, nr: Integer;
- function monRespawn (monidx: Integer; mon: TMonster): Boolean;
+ function monRespawn (mon: TMonster): Boolean;
begin
result := false; // don't stop
if not mon.FNoRespawn then mon.Respawn();
begin
Result := '';
- MapList := g_Map_GetMapsList(MapsDir + gGameSettings.WAD);
+ MapList := g_Map_GetMapsList(gGameSettings.WAD);
if MapList = nil then
Exit;
else
Result := MapList[MapIndex + 1];
- if not g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + Result) then Result := Map;
+ if not g_Map_Exist(gGameSettings.WAD + ':\' + Result) then Result := Map;
end;
MapList := nil;
procedure g_Game_DeleteTestMap();
var
a: Integer;
- MapName: Char16;
+ //MapName: AnsiString;
WadName: string;
{
WAD: TWADFile;
- MapList: SArray;
+ MapList: SSArray;
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)));
{
// Èìÿ êàðòû íå ñòàíäàðòíîå òåñòîâîå:
if gTempDelete then DeleteFile(WadName);
end;
-procedure GameCVars(P: SArray);
+procedure GameCVars(P: SSArray);
var
a, b: Integer;
stat: TPlayerStatArray;
begin
stat := nil;
cmd := LowerCase(P[0]);
- if cmd = 'r_showfps' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowFPS := (P[1][1] = '1');
-
- if gShowFPS then
- g_Console_Add(_lc[I_MSG_SHOW_FPS_ON])
- else
- g_Console_Add(_lc[I_MSG_SHOW_FPS_OFF]);
- end
- else if (cmd = 'g_friendlyfire') and not g_Game_IsClient then
+ if (cmd = 'g_friendlyfire') and not g_Game_IsClient then
begin
with gGameSettings do
begin
begin
if (Length(P) > 1) then
NetInterpLevel := StrToIntDef(P[1], NetInterpLevel);
-
g_Console_Add('net_interp = ' + IntToStr(NetInterpLevel));
- config := TConfig.CreateFile(GameDir+'/'+CONFIG_FILENAME);
- config.WriteInt('Client', 'InterpolationSteps', NetInterpLevel);
- config.SaveFile(GameDir+'/'+CONFIG_FILENAME);
- config.Free();
+ s := e_GetWriteableDir(ConfigDirs);
+ if s <> '' then
+ begin
+ config := TConfig.CreateFile(s + '/' + CONFIG_FILENAME);
+ config.WriteInt('Client', 'InterpolationSteps', NetInterpLevel);
+ config.SaveFile(s + '/' + CONFIG_FILENAME);
+ config.Free
+ end
end
else if cmd = 'net_forceplayerupdate' then
begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
+ if (Length(P) > 1) and ((P[1] = '1') or (P[1] = '0')) then
NetForcePlayerUpdate := (P[1][1] = '1');
if NetForcePlayerUpdate then
g_Console_Add('net_forceplayerupdate = 1')
else
g_Console_Add('net_forceplayerupdate = 0');
- config := TConfig.CreateFile(GameDir+'/'+CONFIG_FILENAME);
- config.WriteBool('Client', 'ForcePlayerUpdate', NetForcePlayerUpdate);
- config.SaveFile(GameDir+'/'+CONFIG_FILENAME);
- config.Free();
+
+ s := e_GetWriteableDir(ConfigDirs);
+ if s <> '' then
+ begin
+ config := TConfig.CreateFile(s + '/' + CONFIG_FILENAME);
+ config.WriteBool('Client', 'ForcePlayerUpdate', NetForcePlayerUpdate);
+ config.SaveFile(s + '/' + CONFIG_FILENAME);
+ config.Free
+ end
end
else if cmd = 'net_predictself' then
begin
g_Console_Add('net_predictself = 1')
else
g_Console_Add('net_predictself = 0');
- config := TConfig.CreateFile(GameDir+'/'+CONFIG_FILENAME);
- config.WriteBool('Client', 'PredictSelf', NetPredictSelf);
- config.SaveFile(GameDir+'/'+CONFIG_FILENAME);
- config.Free();
+
+ s := e_GetWriteableDir(ConfigDirs);
+ if s <> '' then
+ begin
+ config := TConfig.CreateFile(s + '/' + CONFIG_FILENAME);
+ config.WriteBool('Client', 'PredictSelf', NetPredictSelf);
+ config.SaveFile(s + '/' + CONFIG_FILENAME);
+ config.Free
+ end
end
else if cmd = 'sv_name' then
begin
NetServerName := P[1];
if Length(NetServerName) > 64 then
SetLength(NetServerName, 64);
- if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerRenamed();
end;
g_Console_Add(cmd + ' = "' + NetServerName + '"');
NetPassword := P[1];
if Length(NetPassword) > 24 then
SetLength(NetPassword, 24);
- if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerRenamed();
end;
g_Console_Add(cmd + ' = "' + AnsiLowerCase(NetPassword) + '"');
begin
b := 0;
for a := 0 to High(NetClients) do
+ begin
if NetClients[a].Used then
begin
Inc(b);
MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
end;
end;
- if NetUseMaster then
- g_Net_Slist_Update;
+ end;
+ g_Net_Slist_ServerRenamed();
end;
end;
if (Length(P) > 1) then
begin
NetUseMaster := StrToIntDef(P[1], Byte(NetUseMaster)) > 0;
- if g_Game_IsServer and g_Game_IsNet then
- if NetUseMaster then
- begin
- if NetMPeer = nil then
- if not g_Net_Slist_Connect() then
- g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR]);
- g_Net_Slist_Update();
- end
- else
- if NetMPeer <> nil then
- g_Net_Slist_Disconnect();
+ if NetUseMaster then g_Net_Slist_Public() else g_Net_Slist_Private();
end;
g_Console_Add(cmd + ' = ' + IntToStr(Byte(NetUseMaster)));
end
else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
begin
- if cmd = 'r_showtime' then
+ if cmd = 'r_showscore' then
begin
if (Length(P) > 1) and
((P[1] = '1') or (P[1] = '0')) then
- gShowTime := (P[1][1] = '1');
+ gShowGoals := (P[1][1] = '1');
- if gShowTime then
- g_Console_Add(_lc[I_MSG_TIME_ON])
+ if gShowGoals then
+ g_Console_Add(_lc[I_MSG_SCORE_ON])
else
- g_Console_Add(_lc[I_MSG_TIME_OFF]);
+ g_Console_Add(_lc[I_MSG_SCORE_OFF]);
end
- else if cmd = 'r_showscore' then
- begin
- if (Length(P) > 1) and
- ((P[1] = '1') or (P[1] = '0')) then
- gShowGoals := (P[1][1] = '1');
-
- if gShowGoals then
- g_Console_Add(_lc[I_MSG_SCORE_ON])
- else
- g_Console_Add(_lc[I_MSG_SCORE_OFF]);
- end
- else if cmd = 'r_showstat' then
+ else if cmd = 'r_showstat' then
begin
if (Length(P) > 1) and
((P[1] = '1') or (P[1] = '0')) then
end;
end;
-// profiler console commands
-procedure ProfilerCommands (P: SArray);
+procedure PrintHeapStats();
var
- cmd: string;
-
- function getBool (idx: Integer): Integer;
- begin
- if (idx < 0) or (idx > High(P)) then begin result := -1; exit; end;
- result := 0;
- if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
- end;
-
+ hs: TFPCHeapStatus;
begin
- //if not gDebugMode then exit;
- cmd := LowerCase(P[0]);
-
- if cmd = 'pf_draw_frame' then
- begin
- g_profile_frame_draw := not g_profile_frame_draw;
- exit;
- end;
-
- if cmd = 'pf_update_frame' then
- begin
- g_profile_frame_update := not g_profile_frame_update;
- exit;
- end;
-
- if cmd = 'pf_coldet' then
- begin
- g_profile_collision := not g_profile_collision;
- exit;
- end;
-
- if cmd = 'r_sq_draw' then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gdbg_map_use_accel_render := false;
- 1: gdbg_map_use_accel_render := true;
- end;
- if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
- exit;
- end;
-
- if cmd = 'dbg_sq_coldet' then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gdbg_map_use_accel_coldet := false;
- 1: gdbg_map_use_accel_coldet := true;
- end;
- if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
- exit;
- end;
-
- if (cmd = 'sq_use_grid') or (cmd = 'sq_use_tree') then
- begin
- gdbg_map_use_tree_coldet := (cmd = 'sq_use_tree');
- if gdbg_map_use_tree_coldet then g_Console_Add('coldet acceleration: tree') else g_Console_Add('coldet acceleration: grid');
- exit;
- end;
-
- if (cmd = 'r_sq_use_grid') or (cmd = 'r_sq_use_tree') then
- begin
- gdbg_map_use_tree_draw := (cmd = 'r_sq_use_tree');
- if gdbg_map_use_tree_draw then g_Console_Add('render acceleration: tree') else g_Console_Add('render acceleration: grid');
- exit;
- end;
-
- if (cmd = 't_dump_node_queries') then
- begin
- case getBool(1) of
- -1: begin end;
- 0: gdbg_map_dump_coldet_tree_queries := false;
- 1: gdbg_map_dump_coldet_tree_queries := true;
- end;
- if gdbg_map_dump_coldet_tree_queries then g_Console_Add('grid coldet tree queries: tan') else g_Console_Add('grid coldet tree queries: ona');
- exit;
- end;
+ 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);
+procedure DebugCommands(P: SSArray);
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
begin
- g_Console_Add(Format('gWinPosX = %d, gWinPosY %d', [gWinPosX, gWinPosY]));
- g_Console_Add(Format('gWinRealPosX = %d, gWinRealPosY %d', [gWinRealPosX, gWinRealPosY]));
g_Console_Add(Format('gScreenWidth = %d, gScreenHeight = %d', [gScreenWidth, gScreenHeight]));
g_Console_Add(Format('gWinSizeX = %d, gWinSizeY = %d', [gWinSizeX, gWinSizeY]));
- g_Console_Add(Format('Frame X = %d, Y = %d, Caption Y = %d', [gWinFrameX, gWinFrameY, gWinCaption]));
end
else if cmd = 'd_sounds' then
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]]))
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
g_Console_Add(Format(cmd + ' is %d', [Byte(g_Debug_Player)]));
end
- else if (cmd = 'd_joy') then
+ else if (cmd = 'd_mem') then
begin
- for a := 1 to 8 do
- g_Console_Add(e_JoystickStateToString(a));
+ PrintHeapStats();
end;
end
else
end;
-procedure GameCheats(P: SArray);
+procedure GameCheats(P: SSArray);
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
+ if (not gGameOn) or (not conIsCheatsEnabled) then
begin
g_Console_Add('not available');
exit;
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;
end;
end;
-procedure GameCommands(P: SArray);
+procedure GameCommands(P: SSArray);
var
a, b: Integer;
s, pw: String;
prt: Word;
nm: Boolean;
listen: LongWord;
+ found: Boolean;
begin
// Îáùèå êîìàíäû:
cmd := LowerCase(P[0]);
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
enet_peer_disconnect(pl^.Peer, NET_DISC_KICK);
g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end else if gPlayers <> nil then
for a := Low(gPlayers) to High(gPlayers) do
if gPlayers[a] <> nil then
gPlayers[a].Kill(K_SIMPLEKILL, 0, HIT_DISCON);
g_Console_Add(Format(_lc[I_PLAYER_LEAVE], [gPlayers[a].Name]), True);
g_Player_Remove(gPlayers[a].UID);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
// Åñëè íå ïåðåìåøàòü, ïðè äîáàâëåíèè íîâûõ áîòîâ ïîÿâÿòñÿ ñòàðûå
g_Bot_MixNames();
end;
enet_peer_disconnect(NetClients[a].Peer, NET_DISC_KICK);
g_Console_Add(Format(_lc[I_PLAYER_KICK], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_KICK, 0, s);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end;
end;
end else
enet_peer_disconnect(pl^.Peer, NET_DISC_TEMPBAN);
g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end else
g_Console_Add(Format(_lc[I_NET_ERR_NAME404], [P[1]]));
end else
enet_peer_disconnect(NetClients[a].Peer, NET_DISC_TEMPBAN);
g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end;
end else
g_Console_Add(_lc[I_MSG_SERVERONLY]);
g_Net_SaveBanList();
g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end else
g_Console_Add(Format(_lc[I_NET_ERR_NAME404], [P[1]]));
end else
g_Net_SaveBanList();
g_Console_Add(Format(_lc[I_PLAYER_BAN], [s]));
MH_SEND_GameEvent(NET_EV_PLAYER_BAN, 0, s);
- if NetUseMaster then
- g_Net_Slist_Update;
+ g_Net_Slist_ServerPlayerLeaves();
end;
end else
g_Console_Add(_lc[I_MSG_SERVERONLY]);
else if (cmd = 'addbot') or
(cmd = 'bot_add') then
begin
- if Length(P) > 1 then
+ if Length(P) > 2 then
+ g_Bot_Add(TEAM_NONE, StrToIntDef(P[1], 2), StrToIntDef(P[2], 100))
+ else if Length(P) > 1 then
g_Bot_Add(TEAM_NONE, StrToIntDef(P[1], 2))
else
g_Bot_Add(TEAM_NONE, 2);
else if cmd = 'bot_addlist' then
begin
if Length(P) > 1 then
+ begin
if Length(P) = 2 then
g_Bot_AddList(TEAM_NONE, P[1], StrToIntDef(P[1], -1))
+ else if Length(P) = 3 then
+ g_Bot_AddList(TEAM_NONE, P[1], StrToIntDef(P[1], -1), StrToIntDef(P[2], 100))
else
g_Bot_AddList(IfThen(P[2] = 'red', TEAM_RED, TEAM_BLUE), P[1], StrToIntDef(P[1], -1));
+ end;
end
else if cmd = 'bot_removeall' then
g_Bot_RemoveAll()
g_Console_Add(cmd + ' <WAD> [MAP] [# players]');
Exit;
end;
- // Èãðà åù¸ íå çàïóùåíà, ñíà÷àëà íàì íàäî çàãðóçèòü êàêîé-òî WAD
- P[1] := addWadExtension(P[1]);
- if FileExists(MapsDir + P[1]) then
- begin
- // Åñëè êàðòà íå óêàçàíà, áåð¸ì ïåðâóþ êàðòó â ôàéëå
+ // game not started yet, load fist map from some wad
+ found := false;
+ s := addWadExtension(P[1]);
+ found := e_FindResource(AllMapDirs, s);
+ P[1] := s;
+ if found then
+ begin
+ P[1] := ExpandFileName(P[1]);
+ // if map not choosed then set first map
if Length(P) < 3 then
begin
SetLength(P, 3);
- P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
+ P[2] := g_Game_GetFirstMap(P[1]);
end;
s := P[1] + ':\' + UpperCase(P[2]);
- if g_Map_Exist(MapsDir + s) then
+ if g_Map_Exist(s) then
begin
- // Çàïóñêàåì ñâîþ èãðó
+ // start game
g_Game_Free();
with gGameSettings do
begin
if P[2] = '' then
g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[2])]));
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[2]), P[1]]));
end else
g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
end
Exit;
prt := StrToIntDef(P[2], 25666);
- P[3] := addWadExtension(P[3]);
- if FileExists(MapsDir + P[3]) then
+ s := addWadExtension(P[3]);
+ found := e_FindResource(AllMapDirs, s);
+ P[3] := s;
+ if found then
begin
- // Åñëè êàðòà íå óêàçàíà, áåð¸ì ïåðâóþ êàðòó â ôàéëå
+ // get first map in wad, if not specified
if Length(P) < 5 then
begin
SetLength(P, 5);
- P[4] := g_Game_GetFirstMap(MapsDir + P[1]);
+ P[4] := g_Game_GetFirstMap(P[1]);
end;
-
s := P[3] + ':\' + UpperCase(P[4]);
-
- if g_Map_Exist(MapsDir + s) then
+ if g_Map_Exist(s) then
begin
- // Çàïóñêàåì ñâîþ èãðó
+ // start game
g_Game_Free();
with gGameSettings do
begin
GameMode := g_Game_TextToMode(gcGameMode);
- if gSwitchGameMode <> GM_NONE then
- GameMode := gSwitchGameMode;
+ if gSwitchGameMode <> GM_NONE then GameMode := gSwitchGameMode;
if GameMode = GM_NONE then GameMode := GM_DM;
if GameMode = GM_SINGLE then GameMode := GM_COOP;
b := 0;
if Length(P) >= 6 then
b := StrToIntDef(P[5], 0);
- g_Game_StartServer(s, GameMode, TimeLimit,
- GoalLimit, MaxLives, Options, b, listen, prt);
- end;
+ g_Game_StartServer(s, GameMode, TimeLimit, GoalLimit, MaxLives, Options, b, listen, prt)
+ end
end
else
+ begin
if P[4] = '' then
g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[3]]))
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [UpperCase(P[4])]));
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[3]]));
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [UpperCase(P[4]), P[3]]))
+ end
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[3]]))
+ end
end
else if cmd = 'map' then
begin
if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
begin
g_Console_Add(cmd + ' <MAP>');
- g_Console_Add(cmd + ' <WAD> [MAP]');
- end else
- g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
- end else
+ g_Console_Add(cmd + ' <WAD> [MAP]')
+ end
+ else
+ begin
+ g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+ end
+ end
+ else
+ begin
if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
begin
- // Èä¸ò ñâîÿ èãðà èëè ñåðâåð
if Length(P) < 3 then
begin
- // Ïåðâûé ïàðàìåòð - ëèáî êàðòà, ëèáî èìÿ WAD ôàéëà
+ // first param is map or wad
s := UpperCase(P[1]);
- if g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + s) then
- begin // Êàðòà íàøëàñü
+ if g_Map_Exist(gGameSettings.WAD + ':\' + s) then
+ begin
gExitByTrigger := False;
if gGameOn then
- begin // Èä¸ò èãðà - çàâåðøàåì óðîâåíü
+ begin
+ // already in game, finish current map
gNextMap := s;
gExit := EXIT_ENDLEVELCUSTOM;
end
- else // Èíòåðìèññèÿ - ñðàçó çàãðóæàåì êàðòó
- g_Game_ChangeMap(s);
- end else
+ else
+ begin
+ // intermission, so change map immediately
+ g_Game_ChangeMap(s)
+ end
+ end
+ else
begin
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
- // Òàêîé êàðòû íåò, èùåì WAD ôàéë
- P[1] := addWadExtension(P[1]);
- if FileExists(MapsDir + P[1]) then
+ s := P[1];
+ found := e_FindResource(AllMapDirs, s);
+ P[1] := s;
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, 'WAD ' + P[1]]));
+ if found then
begin
- // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
+ // no such map, found wad
+ pw := P[1];
SetLength(P, 3);
- P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
-
+ P[1] := ExpandFileName(pw);
+ P[2] := g_Game_GetFirstMap(P[1]);
s := P[1] + ':\' + P[2];
-
- if g_Map_Exist(MapsDir + s) then
+ if g_Map_Exist(s) then
begin
gExitByTrigger := False;
if gGameOn then
- begin // Èä¸ò èãðà - çàâåðøàåì óðîâåíü
+ begin
+ // already in game, finish current map
gNextMap := s;
- gExit := EXIT_ENDLEVELCUSTOM;
+ gExit := EXIT_ENDLEVELCUSTOM
end
- else // Èíòåðìèññèÿ - ñðàçó çàãðóæàåì êàðòó
- g_Game_ChangeMap(s);
- end else
+ else
+ begin
+ // intermission, so change map immediately
+ g_Game_ChangeMap(s)
+ end
+ end
+ else
+ begin
if P[2] = '' then
g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+ end
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+ end
end;
- end else
+ end
+ else
begin
- // Óêàçàíî äâà ïàðàìåòðà, çíà÷èò ïåðâûé - WAD ôàéë, à âòîðîé - êàðòà
- P[1] := addWadExtension(P[1]);
- if FileExists(MapsDir + P[1]) then
+ s := addWadExtension(P[1]);
+ found := e_FindResource(AllMapDirs, s);
+ P[1] := s;
+ if found then
begin
- // Íàøëè WAD ôàéë
P[2] := UpperCase(P[2]);
s := P[1] + ':\' + P[2];
-
- if g_Map_Exist(MapsDir + s) then
- begin // Íàøëè êàðòó
+ if g_Map_Exist(s) then
+ begin
gExitByTrigger := False;
if gGameOn then
- begin // Èä¸ò èãðà - çàâåðøàåì óðîâåíü
+ begin
gNextMap := s;
- gExit := EXIT_ENDLEVELCUSTOM;
+ gExit := EXIT_ENDLEVELCUSTOM
end
- else // Èíòåðìèññèÿ - ñðàçó çàãðóæàåì êàðòó
- g_Game_ChangeMap(s);
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
- end;
- end else
- g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
+ else
+ begin
+ g_Game_ChangeMap(s)
+ end
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+ end
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+ end
+ end
+ end
+ else
+ begin
+ g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+ end
+ end
end
else if cmd = 'nextmap' then
begin
if not(gGameOn or (gState = STATE_INTERCUSTOM)) then
+ begin
g_Console_Add(_lc[I_MSG_NOT_GAME])
- else begin
+ end
+ else
+ begin
nm := True;
if Length(P) = 1 then
begin
begin
g_Console_Add(cmd + ' <MAP>');
g_Console_Add(cmd + ' <WAD> [MAP]');
- end else begin
+ end
+ else
+ begin
nm := False;
g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
end;
- end else
+ end
+ else
begin
nm := False;
if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
begin
if Length(P) < 3 then
begin
- // Ïåðâûé ïàðàìåòð - ëèáî êàðòà, ëèáî èìÿ WAD ôàéëà
+ // first param is map or wad
s := UpperCase(P[1]);
- if g_Map_Exist(MapsDir + gGameSettings.WAD + ':\' + s) then
- begin // Êàðòà íàøëàñü
+ if g_Map_Exist(gGameSettings.WAD + ':\' + s) then
+ begin
+ // map founded
gExitByTrigger := False;
gNextMap := s;
nm := True;
- end else
+ end
+ else
begin
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [s]));
- // Òàêîé êàðòû íåò, èùåì WAD ôàéë
- P[1] := addWadExtension(P[1]);
- if FileExists(MapsDir + P[1]) then
+ // no such map, found wad
+ pw := addWadExtension(P[1]);
+ found := e_FindResource(MapDirs, pw);
+ if not found then
+ found := e_FindResource(WadDirs, pw);
+ P[1] := pw;
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP_FALLBACK], [s, P[1]]));
+ if found then
begin
- // Ïàðàìåòðà êàðòû íåò, ïîýòîìó ñòàâèì ïåðâóþ èç ôàéëà
+ // map not specified, select first map
SetLength(P, 3);
- P[2] := g_Game_GetFirstMap(MapsDir + P[1]);
-
+ P[2] := g_Game_GetFirstMap(P[1]);
s := P[1] + ':\' + P[2];
-
- if g_Map_Exist(MapsDir + s) then
- begin // Óñòàíàâëèâàåì êàðòó
+ if g_Map_Exist(s) then
+ begin
gExitByTrigger := False;
gNextMap := s;
- nm := True;
- end else
+ nm := True
+ end
+ else
+ begin
if P[2] = '' then
g_Console_Add(Format(_lc[I_MSG_NO_MAPS], [P[1]]))
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
- end;
- end else
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+ end
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+ end
+ end
+ end
+ else
begin
- // Óêàçàíî äâà ïàðàìåòðà, çíà÷èò ïåðâûé - WAD ôàéë, à âòîðîé - êàðòà
- P[1] := addWadExtension(P[1]);
- if FileExists(MapsDir + P[1]) then
+ // specified two params wad + map
+ pw := addWadExtension(P[1]);
+ found := e_FindResource(MapDirs, pw);
+ if not found then
+ found := e_FindResource(MapDirs, pw);
+ P[1] := pw;
+ if found then
begin
- // Íàøëè WAD ôàéë
P[2] := UpperCase(P[2]);
s := P[1] + ':\' + P[2];
-
- if g_Map_Exist(MapsDir + s) then
- begin // Íàøëè êàðòó
+ if g_Map_Exist(s) then
+ begin
gExitByTrigger := False;
gNextMap := s;
- nm := True;
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]));
- end else
- g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]));
- end;
- end else
- g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
+ nm := True
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP], [P[2]]))
+ end
+ end
+ else
+ begin
+ g_Console_Add(Format(_lc[I_MSG_NO_WAD], [P[1]]))
+ end
+ end
+ end
+ else
+ begin
+ g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+ end
end;
if nm then
+ begin
if gNextMap = '' then
g_Console_Add(_lc[I_MSG_NEXTMAP_UNSET])
else
- g_Console_Add(Format(_lc[I_MSG_NEXTMAP_SET], [gNextMap]));
- end;
+ g_Console_Add(Format(_lc[I_MSG_NEXTMAP_SET], [gNextMap]))
+ end
+ end
end
else if (cmd = 'endmap') or (cmd = 'goodbye') then
begin
if not gGameOn then
+ begin
g_Console_Add(_lc[I_MSG_NOT_GAME])
+ end
else
+ begin
if g_Game_IsServer and (gGameSettings.GameType <> GT_SINGLE) then
begin
gExitByTrigger := False;
- // Ñëåäóþùàÿ êàðòà íå çàäàíà, ïðîáóåì íàéòè òðèããåð Âûõîä
+ // next map not specified, try to find trigger EXIT
if (gNextMap = '') and (gTriggers <> nil) then
+ begin
for a := 0 to High(gTriggers) do
+ begin
if gTriggers[a].TriggerType = TRIGGER_EXIT then
begin
gExitByTrigger := True;
- gNextMap := gTriggers[a].Data.MapName;
- Break;
- end;
- // Èùåì ñëåäóþùóþ êàðòó â WAD ôàéëå
+ //gNextMap := gTriggers[a].Data.MapName;
+ gNextMap := gTriggers[a].tgcMap;
+ Break
+ end
+ end
+ end;
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;
- // Åñëè êàðòà íàéäåíà, âûõîäèì ñ óðîâíÿ
- if g_Map_Exist(MapsDir + s) then
+ if g_Map_Exist(s) then
gExit := EXIT_ENDLEVELCUSTOM
else
- g_Console_Add(Format(_lc[I_MSG_NO_MAP], [gNextMap]));
- end else
- g_Console_Add(_lc[I_MSG_GM_UNAVAIL]);
+ g_Console_Add(Format(_lc[I_MSG_NO_MAP], [gNextMap]))
+ end
+ else
+ begin
+ g_Console_Add(_lc[I_MSG_GM_UNAVAIL])
+ end
+ end
end
else if (cmd = 'event') then
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 cmd = 'screenshot' then
+ begin
+ g_TakeScreenShot()
+ end
+ else if cmd = 'weapon' then
+ begin
+ if Length(p) = 2 then
+ begin
+ a := WP_FIRST + StrToInt(p[1]) - 1;
+ if (a >= WP_FIRST) and (a <= WP_LAST) then
+ gSelectWeapon[0, a] := True
+ end
+ end
+ else if (cmd = 'p1_weapon') or (cmd = 'p2_weapon') then
+ begin
+ if Length(p) = 2 then
+ begin
+ a := WP_FIRST + StrToInt(p[1]) - 1;
+ b := ord(cmd[2]) - ord('1');
+ if (a >= WP_FIRST) and (a <= WP_LAST) then
+ gSelectWeapon[b, a] := True
+ end
+ end
// Êîìàíäû Ñâîåé èãðû:
else if gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT] then
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
end;
end;
-procedure g_TakeScreenShot();
-var
- a: Word;
- FileName: string;
- ssdir, t: string;
- st: TStream;
- ok: Boolean;
+procedure g_TakeScreenShot(Filename: string = ''; StatShot: Boolean = False);
+ var s: TStream; t: TDateTime; dir, date, name: String;
begin
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
- 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;
+ dir := e_GetWriteableDir(ScreenshotDirs);
+
+ if Filename = '' then
+ begin
+ t := Now;
+ DateTimeToString(date, 'yyyy-mm-dd-hh-nn-ss', t);
+ Filename := 'screenshot-' + date;
end;
+
+ name := e_CatPath(dir, Filename + '.png');
+ s := createDiskFile(name);
+ try
+ e_MakeScreenshot(s, gScreenWidth, gScreenHeight);
+ s.Free;
+ g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [name]))
+ except
+ g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [name]));
+ s.Free;
+ DeleteFile(name)
+ end
except
- end;
+ g_Console_Add('oh shit, i can''t create screenshot!')
+ end
end;
procedure g_Game_InGameMenu(Show: Boolean);
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;
- gPause := Enable;
- g_Game_PauseAllSounds(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;
+
+ if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause);
end;
procedure g_Game_PauseAllSounds(Enable: Boolean);
e_StopChannels();
end;
-procedure g_Game_UpdateTriggerSounds();
-var
- i: Integer;
+procedure g_Game_UpdateTriggerSounds;
+ var i: Integer;
begin
if gTriggers <> nil then
for i := 0 to High(gTriggers) do
with gTriggers[i] do
- if (TriggerType = TRIGGER_SOUND) and
- (Sound <> nil) and
- (Data.Local) 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);
- end
- else
- Sound.SetCoords(X+(Width div 2), Y+(Height div 2), Data.Volume/255.0);
- end;
+ if (TriggerType = TRIGGER_SOUND) and (Sound <> nil) and tgcLocal and Sound.IsPlaying() then
+ Sound.SetCoordsRect(X, Y, Width, Height, tgcVolume / 255.0)
end;
function g_Game_IsWatchedPlayer(UID: Word): Boolean;
procedure g_Game_Message(Msg: string; Time: Word);
begin
- MessageText := b_Text_Format(Msg);
+ MessageLineLength := (gScreenWidth - 204) div e_CharFont_GetMaxWidth(gMenuFont);
+ MessageText := b_Text_Wrap(b_Text_Format(Msg), MessageLineLength);
MessageTime := Time;
end;
+procedure g_Game_ChatSound(Text: String; Taunt: Boolean = True);
+const
+ punct: Array[0..13] of String =
+ ('.', ',', ':', ';', '!', '?', '(', ')', '''', '"', '/', '\', '*', '^');
+var
+ i, j: Integer;
+ ok: Boolean;
+ fpText: String;
+
+ function IsPunctuation(S: String): Boolean;
+ var
+ i: Integer;
+ begin
+ Result := False;
+ if Length(S) <> 1 then
+ Exit;
+ for i := Low(punct) to High(punct) do
+ if S = punct[i] then
+ begin
+ Result := True;
+ break;
+ end;
+ end;
+ function FilterPunctuation(S: String): String;
+ var
+ i: Integer;
+ begin
+ for i := Low(punct) to High(punct) do
+ S := StringReplace(S, punct[i], ' ', [rfReplaceAll]);
+ Result := S;
+ end;
+begin
+ ok := False;
+
+ if gUseChatSounds and Taunt and (gChatSounds <> nil) and (Pos(': ', Text) > 0) then
+ begin
+ // remove player name
+ Delete(Text, 1, Pos(': ', Text) + 2 - 1);
+ // for FullWord check
+ Text := toLowerCase1251(' ' + Text + ' ');
+ fpText := FilterPunctuation(Text);
+
+ for i := 0 to Length(gChatSounds) - 1 do
+ begin
+ ok := True;
+ for j := 0 to Length(gChatSounds[i].Tags) - 1 do
+ begin
+ if gChatSounds[i].FullWord and (not IsPunctuation(gChatSounds[i].Tags[j])) then
+ ok := Pos(' ' + gChatSounds[i].Tags[j] + ' ', fpText) > 0
+ else
+ ok := Pos(gChatSounds[i].Tags[j], Text) > 0;
+ if not ok then
+ break;
+ end;
+ if ok then
+ begin
+ gChatSounds[i].Sound.Play();
+ break;
+ end;
+ end;
+ end;
+ if not ok then
+ g_Sound_PlayEx('SOUND_GAME_RADIO');
+end;
+
procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
var
a: Integer;
killsnd[n].Play();
end;
+procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
+var
+ a: Integer;
+begin
+ case gAnnouncer of
+ ANNOUNCE_NONE:
+ Exit;
+ ANNOUNCE_ME,
+ ANNOUNCE_MEPLUS:
+ if not g_Game_IsWatchedPlayer(SpawnerUID) then
+ Exit;
+ end;
+ for a := 0 to 2 do
+ if hahasnd[a].IsPlaying() then
+ Exit;
+
+ hahasnd[Random(3)].Play();
+end;
+
procedure g_Game_StartVote(Command, Initiator: string);
var
Need: Integer;
CurValue := 0;
MaxValue := Max;
ShowCount := 0;
+ PBarWasHere := false;
end;
g_ActiveWindow := nil;
- ProcessLoading;
+ 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;
+ ProcessLoading();
end;
end;
end;
for len := Low(Msgs) to High(Msgs) do
Msgs[len] := '';
NextMsg := 0;
+ PBarWasHere := false;
end;
end;
begin
Parse_Params(pars);
- s := Find_Param_Value(pars, '--profile-render');
- if (s <> '') then g_profile_frame_draw := true;
-
- s := Find_Param_Value(pars, '--profile-coldet');
- if (s <> '') then g_profile_collision := true;
-
// Debug mode:
s := Find_Param_Value(pars, '--debug');
if (s <> '') then
if (s <> '') then
gMapOnce := True;
+ // Override map to test:
+ s := LowerCase(Find_Param_Value(pars, '-testmap'));
+ if s <> '' then
+ begin
+ if e_IsValidResourceName(s) then
+ e_FindResource(AllMapDirs, s);
+ gTestMap := ExpandFileName(s);
+ end;
+
// 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);
+ //gMapToDelete := MapsDir + map;
+ e_WriteLog('"--testdelete" is deprecated, use --tempdelete.', TMsgType.Fatal);
Halt(1);
end;
// Delete temporary WAD after play:
s := Find_Param_Value(pars, '--tempdelete');
- if (s <> '') then
+ if (s <> '') and (gTestMap <> '') then
begin
- gMapToDelete := MapsDir + map;
+ gMapToDelete := gTestMap;
gTempDelete := True;
end;
// Number of players:
s := Find_Param_Value(pars, '-pl');
if (s = '') then
- n := 1
+ n := DEFAULT_PLAYERS
else
- n := StrToIntDef(s, 1);
+ n := StrToIntDef(s, DEFAULT_PLAYERS);
// Start:
s := Find_Param_Value(pars, '-port');
s := Find_Param_Value(pars, '-exec');
if s <> '' then
begin
- if Pos(':\', s) = 0 then
- s := GameDir + '/' + s;
+// if not isWadPath(s) then
+// s := GameDir + '/' + s;
{$I-}
AssignFile(F, s);
Reset(F);
if IOResult <> 0 then
begin
- e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), MSG_WARNING);
+ e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), TMsgType.Warning);
g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
CloseFile(F);
Exit;
end;
- e_WriteLog('Executing script: ' + s, MSG_NOTIFY);
+ e_WriteLog('Executing script: ' + s, TMsgType.Notify);
g_Console_Add(Format(_lc[I_CONSOLE_EXEC], [s]));
while not EOF(F) do
ReadLn(F, s);
if IOResult <> 0 then
begin
- e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), MSG_WARNING);
+ e_WriteLog(Format(_lc[I_SIMPLE_ERROR], ['Failed to read file: ' + s]), TMsgType.Warning);
g_Console_Add(Format(_lc[I_CONSOLE_ERROR_READ], [s]));
CloseFile(F);
Exit;
SetLength(pars, 0);
end;
+begin
+ conRegVar('pf_draw_frame', @g_profile_frame_draw, 'draw frame rendering profiles', 'render profiles');
+ //conRegVar('pf_update_frame', @g_profile_frame_update, 'draw frame updating profiles', 'update profiles');
+ conRegVar('pf_coldet', @g_profile_collision, 'draw collision detection profiles', 'coldet profiles');
+ conRegVar('pf_los', @g_profile_los, 'draw monster LOS profiles', 'monster LOS profiles');
+
+ conRegVar('r_sq_draw', @gdbg_map_use_accel_render, 'accelerated spatial queries in rendering', 'accelerated rendering');
+ conRegVar('cd_sq_enabled', @gdbg_map_use_accel_coldet, 'accelerated spatial queries in map coldet', 'accelerated map coldet');
+ conRegVar('mon_sq_enabled', @gmon_debug_use_sqaccel, 'accelerated spatial queries for monsters', 'accelerated monster coldet');
+ conRegVar('wtrace_sq_enabled', @gwep_debug_fast_trace, 'accelerated spatial queries for weapon hitscan trace', 'accelerated weapon hitscan');
+
+ conRegVar('pr_enabled', @gpart_dbg_enabled, 'enable/disable particles', 'particles');
+ conRegVar('pr_phys_enabled', @gpart_dbg_phys_enabled, 'enable/disable particle physics', 'particle physics');
+
+ 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);
+
+ conRegVar('r_scale', @g_dbg_scale, 0.01, 100.0, 'render scale', '', 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');
+
+ conRegVar('r_smallmap_align_h', @r_smallmap_h, 'halign: 0: left; 1: center; 2: right', 'horizontal aligning of small maps');
+ conRegVar('r_smallmap_align_v', @r_smallmap_v, 'valign: 0: top; 1: center; 2: bottom', 'vertial aligning of small maps');
+
+ conRegVar('r_showfps', @gShowFPS, 'draw fps counter', 'draw fps counter');
+ conRegVar('r_showtime', @gShowTime, 'show game time', 'show game time');
end.