Clean module Mobs for reimplementation mobs

[cavecraft.git] / src / CAVE.mpsrc

diff --git a/src/CAVE.mpsrc b/src/CAVE.mpsrc
index af345fdff2db525c4e5ca5a5aa1f44efbd8c4ba7..4f61a7db150db7a01614a4bdc5f285d6244b66b3 100644 (file)
--- a/src/CAVE.mpsrc
+++ b/src/CAVE.mpsrc
@@ -13,7 +13,7 @@ uses
  canvas,\r
  items,\r
  safeload,\r
- mob,\r
+ mobs,\r
  console,\r
  effects,\r
  particles,\r
@@ -159,7 +159,7 @@ procedure ClearTextures;
     for ix := 0 to 15 do\r
       pr_boom[ix] := no;\r
 \r
-    mob.freeSkin;\r
+    Mobs.FreeTextures;\r
 \r
     sky := no;\r
     sun := no;\r
@@ -209,7 +209,7 @@ procedure loadtexture(path:string);
   console.exec('textures.cfg', 'AUTO');\r
 \r
   player.loadSkin('char_ani.png', path);\r
-  mob.loadSkin(path);\r
+  Mobs.LoadTextures(path);\r
 \r
   im:=ld_tex('gui.png',path,'gui/');\r
   gui[0]:=rotate_image_from_image(im,0,0,16,16,0);\r
@@ -346,7 +346,7 @@ procedure cleargame;
 \r
   drop.resetData;\r
 \r
-  mob.resetData;\r
+  Mobs.ResetData;\r
 \r
   //gb_up_pa:=0;\r
   reset_particles(max_particles+1);\r
@@ -524,7 +524,7 @@ procedure saveworld(path:string);
      furnace.saveData;\r
      drw_load_line('Mobs',70);\r
      //Mobs\r
-     mob.saveData;\r
+     Mobs.SaveData;\r
      drw_load_line('Drop',80);\r
      //Drop\r
      drop.saveData;\r
@@ -655,7 +655,7 @@ function loadworld(path:string):boolean;
      //Furnaces\r
      furnace.loadData;\r
      //Mobs\r
-     mob.loadData;\r
+     Mobs.LoadData;\r
      drw_load_line('Drop',80);\r
      //Drop\r
      drop.loadData;\r
@@ -2046,7 +2046,7 @@ procedure draw;
    end;\r
 \r
   {===================[mobs]===================}\r
-  mob.draw(camx, camy);\r
+  Mobs.Draw(camx, camy);\r
   {===================[draw_blocks]===================}\r
   for ix:=minx to maxx do\r
   for iy:=miny to maxy do\r
@@ -2292,9 +2292,9 @@ function rt_useweap:boolean;
    damg:=1;\r
 \r
   if posi=0 then\r
-   i:=mob.findAndHit(damg, x-TILE_SIZE, y, TILE_SIZE+(w/2), h, -2, -3);\r
+   i:=Mobs.findAndHit(damg, x-TILE_SIZE, y, TILE_SIZE+(w/2), h, -2, -3);\r
   else\r
-   i:=mob.findAndHit(damg, x+(w/2), y, TILE_SIZE+(w/2), h, 2, -3);\r
+   i:=Mobs.findAndHit(damg, x+(w/2), y, TILE_SIZE+(w/2), h, 2, -3);\r
 \r
   if i<>-1 then\r
    begin\r
@@ -2729,9 +2729,9 @@ procedure phyhandler;
  var\r
   i:integer;\r
  begin\r
-  player.calcPhysics;\r
-  mob.updatePhy;\r
-  drop.calcPhy;\r
+  Player.CalcPhysics;\r
+  Mobs.UpdatePhy;\r
+  Drop.CalcPhy;\r
  end;\r
 \r
 procedure light_fillrect(l,x,y,r:integer);\r
@@ -2933,7 +2933,7 @@ procedure game;
 \r
   //if s_spawn_mob then if random(4096)=1547 then megaspawn;\r
 \r
-  mob.update;\r
+  Mobs.Update;\r
 \r
   if particle_upd then update_particle;\r
 \r