X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=06e5ace8c04ede683e71ac4445ba8e019cc8df49;hb=89b25c381542119e51cf5278f29a8bbd68cc4f9e;hp=d5a5a83e80c31de8e30805ecbbbb4c41b81f086a;hpb=7292fe409145dfcbb2776e34bb64d56e32985b9d;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index d5a5a83..06e5ace 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *) -{$INCLUDE g_amodes.inc} +{$INCLUDE ../shared/a_modes.inc} unit g_main; interface @@ -40,7 +40,7 @@ uses 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, + g_menu, g_language, g_net, utils, conbuf, envvars; var @@ -302,7 +302,8 @@ begin if gTriggers[a].TriggerType = TRIGGER_EXIT then begin gExitByTrigger := True; - g_Game_ExitLevel(gTriggers[a].Data.MapName); + //g_Game_ExitLevel(gTriggers[a].Data.MapName); + g_Game_ExitLevel(gTriggers[a].trigData.trigMapName); Break; end; goto Cheated;