Fix load cfg files and textures

[cavecraft.git] / src / console.pas

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