X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=1cf480864080a2c4115db2cae221b07de7e16299;hb=6d6df4e3427cd01e03e172984c9d0d391ff38032;hp=93368940da0d943a1223f77191f923c7432b5bfd;hpb=223356cbae3197afc861efa6241c4ae91bd92885;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 9336894..1cf4808 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -20,7 +20,7 @@ interface uses g_basic, g_player, e_graphics, Classes, g_res_downloader, - SysUtils, g_sound, g_gui, MAPSTRUCT, wadreader, md5, xprofiler; + SysUtils, g_sound, g_gui, MAPDEF, wadreader, md5, xprofiler; type TGameSettings = record @@ -63,7 +63,7 @@ type THearPoint = record Active: Boolean; - Coords: TPoint; + Coords: TDFPoint; end; function g_Game_IsNet(): Boolean; @@ -209,9 +209,9 @@ var gPlayer1Settings: TPlayerSettings; gPlayer2Settings: TPlayerSettings; gGameOn: Boolean; - gPlayerScreenSize: TPoint; - gPlayer1ScreenCoord: TPoint; - gPlayer2ScreenCoord: TPoint; + gPlayerScreenSize: TDFPoint; + gPlayer1ScreenCoord: TDFPoint; + gPlayer2ScreenCoord: TDFPoint; gPlayer1: TPlayer = nil; gPlayer2: TPlayer = nil; gPlayerDrawn: TPlayer = nil; @@ -338,7 +338,7 @@ uses g_textures, g_main, g_window, g_menu, e_input, e_log, g_console, g_items, g_map, g_panel, g_playermodel, g_gfx, g_options, g_weapons, Math, - g_triggers, MAPDEF, g_monsters, e_sound, CONFIG, + g_triggers, g_monsters, e_sound, CONFIG, BinEditor, g_language, g_net, SDL, ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt, utils, sfs, g_holmes; @@ -5017,7 +5017,7 @@ procedure DebugCommands(P: SArray); var a, b: Integer; cmd: string; - //pt: TPoint; + //pt: TDFPoint; mon: TMonster; begin // Êîìàíäû îòëàäî÷íîãî ðåæèìà: