X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2FCAVE.mpsrc;h=6de766ba1a2b5bb5536d231afc86dd059fc144ec;hb=1ca2eb4e93db3ede5fefff927b77abcfa3fcf325;hp=ccdef84c131cb89a5c76f85934566c3e4ab5663e;hpb=1ef13d5bd0592dde48cc837e05b13e93e82db25b;p=cavecraft.git

diff --git a/src/CAVE.mpsrc b/src/CAVE.mpsrc
index ccdef84..6de766b 100644
--- a/src/CAVE.mpsrc
+++ b/src/CAVE.mpsrc
@@ -32,8 +32,8 @@ uses
  video;
 
 const
- version='BETA 9';
- version_map=8;
+ version = 'BETA 9';
+ version_map = 9;
 
 var
  keymode,updx,updy:integer;
@@ -339,19 +339,7 @@ procedure cleargame;
 
   chest.resetData;
 
-  {for ix:=0 to 15 do
-   begin
-    b_furnace[ix]:=false;
-    for iy:=0 to 4 do
-     begin
-      furnace[ix,iy].item_i:=0;
-      furnace[ix,iy].sum_i:=0;
-      furnace_gg[ix].f_gor:=15;
-      furnace_gg[ix].fire_time:=0;
-      furnace_gg[ix].f_got:=0;
-      furnace_gg[ix].got_time:=0;
-     end;
-   end;}
+  furnace.resetData;
 
   drop.resetData;
 
@@ -513,9 +501,8 @@ procedure saveworld(path:string);
    if file_exists(path+world_name)<>1 then file_create(path+world_name);
    if open_file(path+world_name)=1 then
     begin
-      writeint(player.getX);
-      writeint(player.getX);
-     //Matrix
+     writeint(player.getX);
+     writeint(player.getY);
      //Matrix
      SaveMapRLE;
      SaveMapInfoRLE;
@@ -531,17 +518,7 @@ procedure saveworld(path:string);
      chest.saveData;
      drw_load_line('Furnaces',60);
      //Furnaces
-    /* for ix:=0 to 15 do
-      begin
-       writebool(b_furnace[ix]);
-       writeint(furnace_gg[ix].f_gor);
-       writeint(furnace_gg[ix].f_got);
-        for iy:=0 to 4 do
-         begin
-          write_byte(furnace[ix,iy].item_i);
-          writeint(furnace[ix,iy].sum_i);
-         end;
-       end;*/
+     furnace.saveData;
      drw_load_line('Mobs',70);
      //Mobs
      mob.saveData;
@@ -671,26 +648,15 @@ function loadworld(path:string):boolean;
      drw_load_line('Chests',55);
      //Chests
      chest.loadData;
-      drw_load_line('Furnaces',60);
+     drw_load_line('Furnaces',60);
      //Furnaces
-    /* for ix:=0 to 15 do
-      begin
-       b_furnace[ix]:=readbool;
-       furnace_gg[ix].f_gor:=readint;
-       furnace_gg[ix].f_got:=readint;
-        for iy:=0 to 4 do
-         begin
-          furnace[ix,iy].item_i:=read_byte;
-          furnace[ix,iy].sum_i:=readint;
-         end;
-       end;*/
-       drw_load_line('Mobs',70);
+     furnace.loadData;
      //Mobs
      mob.loadData;
-      drw_load_line('Drop',80);
+     drw_load_line('Drop',80);
      //Drop
      drop.loadData;
-      drw_load_line('Particles',85);
+     drw_load_line('Particles',85);
      //Particles
      max_particles:=readint;
      reset_particles(max_particles+1);
@@ -1272,7 +1238,7 @@ function menu_game:boolean;
      if m_cur>3 then m_cur:=0;
     end;
 
-   if clickedKey(KEY_MENU_LEFT) then
+   if (max_r >= 0) and clickedKey(KEY_MENU_LEFT) then
     begin
      cur_name:=cur_name-1;
      if cur_name<0 then cur_name:=0;
@@ -1282,7 +1248,7 @@ function menu_game:boolean;
 
      if file_exists('/'+sd+'/cavecraft/saves/'+names[cur_name]+'/player.dat')=1 then
     end;
-   if clickedKey(KEY_MENU_RIGHT) then
+   if (max_r >= 0) and clickedKey(KEY_MENU_RIGHT) then
     begin
      cur_name:=cur_name+1;
      if cur_name>max_r then cur_name:=max_r;
@@ -2511,6 +2477,8 @@ procedure plr_is_dead;
              y:=last_sleep_y*16;
             end;
          end;
+       player.setX(x);
+       player.setY(y);
        posi:=0;
        curx:=0;
        cury:=0;