X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=969167f098e6fc1461a67fccc32fcb5547e0aad9;hb=cd0837a23eed9896737537add1a93d878a227840;hp=d78c84e12b669971c3928b638ab4e8625f9ecb31;hpb=0968d19494ddf24230a822c02acbe3a3334bc3ad;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index d78c84e..969167f 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -1,3 +1,4 @@ +{$MODE DELPHI} unit g_main; interface @@ -20,11 +21,11 @@ var implementation uses - SDL2, GL, GLExt, WADEDITOR, e_log, g_window, + SDL2, GL, GLExt, wadreader, e_log, g_window, e_graphics, e_input, g_game, g_console, g_gui, e_sound, g_options, g_sound, g_player, g_weapons, SysUtils, g_triggers, MAPDEF, g_map, - MAPSTRUCT, g_menu, g_language, g_net, sfs; + MAPSTRUCT, g_menu, g_language, g_net, utils; var charbuff: Array [0..15] of Char; @@ -43,7 +44,7 @@ begin e_WriteLog('Read config file', MSG_NOTIFY); g_Options_Read(GameDir + '/' + CONFIG_FILENAME); - + e_WriteToStdOut := {$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF} //GetSystemDefaultLCID() @@ -52,7 +53,7 @@ begin //g_Language_Load(DataDir + gLanguage + '.txt'); e_WriteLog(gLanguage, MSG_NOTIFY); g_Language_Set(gLanguage); - + {$IFDEF HEADLESS} sdlflags := SDL_INIT_TIMER or $00004000; {$ELSE} @@ -64,7 +65,7 @@ begin {$ENDIF} if SDL_Init(sdlflags) < 0 then raise Exception.Create('SDL: Init failed: ' + SDL_GetError()); - + {$IFDEF HEADLESS} SDL_StartTextInput(); {$ENDIF} @@ -494,7 +495,7 @@ begin else begin for a := 0 to 14 do charbuff[a] := charbuff[a+1]; - charbuff[15] := SFSUpCase(C); + charbuff[15] := UpCase1251(C); Cheat(); end; end;