Fix load cfg files and textures

[cavecraft.git] / src / CAVE.mpsrc

diff --git a/src/CAVE.mpsrc b/src/CAVE.mpsrc
index e23b86557999db0064020d785f14b54745bd2a30..af345fdff2db525c4e5ca5a5aa1f44efbd8c4ba7 100644 (file)
--- a/src/CAVE.mpsrc
+++ b/src/CAVE.mpsrc
@@ -53,7 +53,7 @@ var
  moon_phase:integer;\r
  toolus,toolind:integer;\r
  osadki_ani:integer;\r
  moon_phase:integer;\r
  toolus,toolind:integer;\r
  osadki_ani:integer;\r

- sd,sav_fl:string;\r
+ sav_fl:string;\r

  global_light:integer;\r
  world_typ:integer;\r
  float:image;\r
  global_light:integer;\r
  world_typ:integer;\r
  float:image;\r


@@ -107,68 +107,70 @@ procedure maxfps;
   delay(del);\r
  end;\r
 \r
   delay(del);\r
  end;\r
 \r

-procedure cleartextures;\r
- var\r
-  no:image;\r
-  ix,iy,iz:integer;\r
- begin\r
-  bg[0]:=no;\r
-  bg[1]:=no;\r
-  float:=no;\r
-  compas:=no;\r
-  for ix:=0 to 7 do clock[ix]:=no;\r
-\r
-  {for ix:=0 to maxBlockTex do\r
-   begin\r
-    tex[ix]:=no;\r
-    tex8[ix]:=no;\r
-   end;\r
-  for ix:=0 to maxItemTex do\r
-   begin\r
-    item[ix]:=no;\r
-    item8[ix]:=no;\r
-   end;}\r
- for ix:=0 to 8 do back[ix]:=no;\r
-\r
-  player.freeSkin;\r
-\r
-  for ix:=0 to 34 do\r
-   gui[ix]:=no;\r
-\r
-  for ix:=0 to 9 do tue[ix]:=no;\r
-\r
-  for ix:=0 to 7 do osad[0,ix]:=no;\r
-  for ix:=0 to 7 do osad[1,ix]:=no;\r
+procedure ClearTextures;\r
+  var\r
+    no : image;\r
+    ix, iy, iz : integer;\r
+  begin\r
+    bg[0] := no;\r
+    bg[1] := no;\r
+    float := no;\r
+    compas := no;\r
+    for ix := 0 to 7 do\r
+      clock[ix] := no;\r
+\r
+    for ix := 0 to maxBlockTex do\r
+      begin\r
+        tex[ix] := no;\r
+        tex8[ix] := no;\r
+      end;\r
+    for ix := 0 to maxItemTex do\r
+      begin\r
+        item[ix] := no;\r
+        item8[ix] := no;\r
+      end;\r

 \r
 \r

-  for ix:=0 to 15 do light[ix]:=no;\r
+    for ix := 0 to 8 do\r
+      back[ix]:=no;\r

 \r
 \r

-  for ix:=0 to 7 do\r
-   begin\r
-    pr_1[ix]:=no;\r
-    pr_2[ix]:=no;\r
-    pr_3[ix]:=no;\r
-    pr_4[ix]:=no;\r
-    pr_5[ix]:=no;\r
-   end;\r
-  bubble:=no;\r
+    player.freeSkin;\r

 \r
 \r

-  for ix:=0 to 15 do\r
-   pr_boom[ix]:=no;\r
+    for ix := 0 to 34 do\r
+      gui[ix] := no;\r
+    for ix := 0 to 9 do\r
+      tue[ix] := no;\r
+    for ix := 0 to 7 do\r
+      osad[0, ix] := no;\r
+    for ix := 0 to 7 do\r
+      osad[1, ix] := no;\r

 \r
 \r

-  mob.freeSkin;\r
+    for ix := 0 to 15 do\r
+      light[ix] := no;\r
+    for ix := 0 to 7 do\r
+      begin\r
+        pr_1[ix] := no;\r
+        pr_2[ix] := no;\r
+        pr_3[ix] := no;\r
+        pr_4[ix] := no;\r
+        pr_5[ix] := no;\r
+     end;\r

 \r
 \r

-  sky:=no;\r
+    bubble := no;\r
+    for ix := 0 to 15 do\r
+      pr_boom[ix] := no;\r

 \r
 \r

-  sun:=no;\r
-  moon:=no;\r
+    mob.freeSkin;\r

 \r
 \r

-  sign_im:=no;\r
+    sky := no;\r
+    sun := no;\r
+    moon := no;\r
+    sign_im := no;\r

 \r
 \r

-  for ix:=0 to CONST_MAX_CURS do\r
-   LoadCurImg(no, ix);\r
+    for ix := 0 to CONST_MAX_CURS do\r
+      LoadCurImg(no, ix);\r

 \r
 \r

-  //resetVirtualKeyboard(-1);\r
- end;\r
+    //resetVirtualKeyboard(-1);\r
+  end;\r

 \r
 procedure create_msg(s:string);\r
  var\r
 \r
 procedure create_msg(s:string);\r
  var\r


@@ -204,6 +206,8 @@ procedure loadtexture(path:string);
     for ix:=0 to 8 do back[ix]:=rotate_image_from_image(im,ix*16,0,16,16,0);\r
    end;\r
 \r
     for ix:=0 to 8 do back[ix]:=rotate_image_from_image(im,ix*16,0,16,16,0);\r
    end;\r
 \r

+  console.exec('textures.cfg', 'AUTO');\r
+\r

   player.loadSkin('char_ani.png', path);\r
   mob.loadSkin(path);\r
 \r
   player.loadSkin('char_ani.png', path);\r
   mob.loadSkin(path);\r
 \r


@@ -1038,7 +1042,7 @@ procedure start_uu;
   rs:=openRecordStore('SD');\r
   sd:=readRecordStoreEntry(rs,1);\r
   closeRecordStore(rs);\r
   rs:=openRecordStore('SD');\r
   sd:=readRecordStoreEntry(rs,1);\r
   closeRecordStore(rs);\r

-  console.exec('autoexec.cfg', 'AUTO', true);\r
+  console.exec('autoexec.cfg', 'AUTO');\r

   if sd='' then\r
    begin\r
     init_touch;\r
   if sd='' then\r
    begin\r
     init_touch;\r


@@ -1394,6 +1398,7 @@ procedure menu_tex;
     if m_cur=0 then begin\r
      if cur_name>0 then\r
       begin\r
     if m_cur=0 then begin\r
      if cur_name>0 then\r
       begin\r

+       debug("Select TexturePack @ /" + sd + "/cavecraft/texturepacks/" + names[cur_name]);\r

        tex_pack:=names[cur_name];\r
        LoadDrawFont('/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/');\r
        loadtexture('/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/');\r
        tex_pack:=names[cur_name];\r
        LoadDrawFont('/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/');\r
        loadtexture('/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/');\r


@@ -1401,9 +1406,13 @@ procedure menu_tex;
        rs:=openRecordStore('TX');\r
        t:=addRecordStoreEntry(rs,tex_pack);\r
        closeRecordStore(rs);\r
        rs:=openRecordStore('TX');\r
        t:=addRecordStoreEntry(rs,tex_pack);\r
        closeRecordStore(rs);\r

+\r
+       LoadDrawFont('/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/');\r
+       loadtexture('/'+sd+'/cavecraft/texturepacks/'+tex_pack+'/');\r

       end;\r
      else\r
       begin\r
       end;\r
      else\r
       begin\r

+       debug("Cancel Select TecturePack");\r

        tex_pack:='';\r
        loadtexture('/');\r
        deleteRecordStore('TX');\r
        tex_pack:='';\r
        loadtexture('/');\r
        deleteRecordStore('TX');\r