X-Git-Url: https://deadsoftware.ru/gitweb?p=cavecraft.git;a=blobdiff_plain;f=src%2Fconsole.pas;h=d239081938d95dfe1b38c054877edd2d8ca483f9;hp=d6fb2f37431ba2a338b4a21739727ee181e79929;hb=e1395893ec7223a8a86c66cdc49e4a9fb48b15c2;hpb=1ef13d5bd0592dde48cc837e05b13e93e82db25b

diff --git a/src/console.pas b/src/console.pas
index d6fb2f3..d239081 100644
--- a/src/console.pas
+++ b/src/console.pas
@@ -2,7 +2,8 @@ unit console;
 
 interface
  const
-  version='BETA 8 FIX';
+  version = 'BETA 9 DEV B12';
+
  var
   osadki:boolean;
   bl_upd:integer;
@@ -38,12 +39,13 @@ interface
 
   sd:string;
 
+  EOFstr, ENDstr:boolean;
   //max_particles:integer; - module
 
  procedure save_settings;
  procedure load_settings;
  procedure call_console;
- procedure exec(s, search:string; acces:boolean);
+ procedure exec(s, search:string);
  procedure addToLog(str:string);
 
 implementation
@@ -57,12 +59,10 @@ var
  lastCommand:string;
 
  parseStr:string;
- EOFstr, ENDstr:boolean;
 
  stack: array [0..0] of integer;
  stack_pointer:integer;
 
- autoexec_acces:boolean;
  regimg:image;
 
  procedure resetStack(size:integer);
@@ -444,7 +444,7 @@ procedure exeCommand(str:string);
 
   com:=UpCase(nextWord);
 
-  if (cheats) or (autoexec_acces) or (gamemode=1) then
+  if (cheats) or (gamemode=1) then
    begin
     if com='TIME' then
      game_time:=decodeInt(nextWord);
@@ -628,7 +628,7 @@ procedure exeCommand(str:string);
   if com='EXEC' then
    begin
     tmp:=nextWord;
-    exec(nextWord, tmp, autoexec_acces);
+    exec(nextWord, tmp);
    end;
   else
   if com='RESET_ITEMS' then
@@ -740,7 +740,9 @@ procedure exeCommand(str:string);
    end;
   else
   if com='LOAD_TEX' then
-   regimg:=ld_tex(nextWord, '/'+sd+'/cavecraft/', '');
+   begin
+    regimg:=ld_tex(nextWord, '/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/', '');
+   end;
   else
   if com='RESET_TEX' then
    resetTmpImg;
@@ -884,15 +886,12 @@ procedure call_console;
   forever;
  end;
 
-procedure exec(s, search:string; acces:boolean);
+procedure exec(s, search:string);
  var
   res:resource;
   str:string;
-  tmp_acces, tmpEOF:boolean;
+  tmpEOF : Boolean;
  begin
-  tmp_acces:=autoexec_acces;
-  autoexec_acces:=acces;
-
   search:=UpCase(search);
 
   if search='LOCAL' then
@@ -930,7 +929,6 @@ procedure exec(s, search:string; acces:boolean);
   else
    begin
     addToLog('Unknown load type "'+search+'", file "'+s+'" not executed!');
-    autoexec_acces:=tmp_acces;
     exit;
    end;
 
@@ -945,8 +943,9 @@ procedure exec(s, search:string; acces:boolean);
   else
    addToLog('Execute file "'+s+'" not found!');
 
+  EOFstr := false;
+  ENDstr := false;
   CloseResource(res);
-  autoexec_acces:=tmp_acces;
  end;
 
 initialization