diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 17c9fdafbd775d156abebd401148926d16b8f4a3..4c2d6ded66bbb5817f54b28f3471330c11b6a2d7 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
uses
SysUtils, Classes,
MAPDEF,
- g_base, g_basic, g_player, r_graphics, g_res_downloader,
+ g_base, g_basic, g_player, g_res_downloader,
g_sound, g_gui, utils, md5, mempool, xprofiler,
g_touch, g_weapons;
UPSTime: LongWord;
DataLoaded: Boolean = False;
MessageTime: Word;
- MessageLineLength: Integer = 80;
MapList: SSArray = nil;
MapIndex: Integer = -1;
InterReadyTime: Integer = -1;
end;
procedure g_TakeScreenShot(Filename: string = '');
- var s: TStream; t: TDateTime; dir, date, name: String;
+ var t: TDateTime; dir, date, name: String;
begin
- if e_NoGraphics then Exit;
- try
- dir := e_GetWriteableDir(ScreenshotDirs);
+ if e_NoGraphics then
+ Exit;
- 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
- g_Console_Add('oh shit, i can''t create screenshot!')
- 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');
+ if r_Render_WriteScreenShot(name) then
+ g_Console_Add(Format(_lc[I_CONSOLE_SCREENSHOT], [name]))
+ else
+ g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [name]));
end;
procedure g_Game_InGameMenu(Show: Boolean);
end;
end;
-procedure g_Game_Message(Msg: string; Time: Word);
-begin
- MessageLineLength := (gScreenWidth - 204) div e_CharFont_GetMaxWidth(gMenuFont);
- MessageText := b_Text_Wrap(b_Text_Format(Msg), MessageLineLength);
- MessageTime := Time;
-end;
+ procedure g_Game_Message (Msg: string; Time: Word);
+ begin
+ MessageText := Msg;
+ MessageTime := Time;
+ end;
procedure g_Game_ChatSound(Text: String; Taunt: Boolean = True);
const