diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index d5a5a83e80c31de8e30805ecbbbb4c41b81f086a..feb59808af5870cd802b22a8c1bbad0ac3e525af 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*)
-{$INCLUDE g_amodes.inc}
+{$INCLUDE ../shared/a_modes.inc}
unit g_main;
interface
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
Cheated;
var
s, s2: string;
- c: Char16;
+ c: ShortString;
a: Integer;
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 Exit;
+ }
+ if not gGameOn then exit;
+ if not conIsCheatsEnabled then exit;
s := 'SOUND_GAME_RADIO';
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].tgcMap);
Break;
end;
goto Cheated;