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