From 8306be7e7ac590f48c3a08c7011fbbdfe48de2c9 Mon Sep 17 00:00:00 2001 From: Milang Date: Tue, 18 Feb 2020 13:03:57 +0100 Subject: [PATCH] minimize ram use due to a lack of ram --- INIT/CasioRAM.mem | Bin 81108 -> 93688 bytes SuperCbr.dlw | 4 ++-- SuperCbr.g1a | Bin 63380 -> 63348 bytes include/world.h | 4 ++-- src/level.c | 4 +++- src/world.c | 14 ++++++-------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/INIT/CasioRAM.mem b/INIT/CasioRAM.mem index 8c58923255a7ec35885d47643c1393f3a9f0aeb0..6a3c43d2c69e81fdb212ff7302817893d909f04d 100644 GIT binary patch delta 19135 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 delta 6652 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 CUXKX? diff --git a/SuperCbr.dlw b/SuperCbr.dlw index e525514..7cfedc6 100644 --- a/SuperCbr.dlw +++ b/SuperCbr.dlw @@ -13,7 +13,7 @@ OptionA=0 [_2] Type=1 -Order=1 +Order=2 Top=15 Left=7800 Height=6885 @@ -25,7 +25,7 @@ OptionB=15 [_3] Type=6 -Order=2 +Order=1 Top=4035 Left=2715 Height=6390 diff --git a/SuperCbr.g1a b/SuperCbr.g1a index 52cce716cca165c7f1295e38f9cf1b99d3c65f39..135b7d299c247298adf0c03cfe638fd715652563 100644 GIT binary patch delta 3081 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 delta 3135 zcmZ8j4@}e99e=MaXOV)XfU62ppm*Vqvrol|3R2E`RF158RN4!uMJrT5!^uB4|FoQB z>17(wM;5m;8;i!{oXOn%%wjT@ai`l@(p=h2J9K<6QfVx1GmSSA#;!wzrQ!jeAO9#ZK$x!|bO>|?to#&wXmG z(oERk0Ac+TpgwM2(oIMC*plDCv}e!{5tzVNbrWG< zI|*~Z{J|B%s$6h!m9WLAwfY1PWOgJT5i>w^9;xOF2i%@jme8P}3Z0wW4K79h-v%(H;m_FV98P`MN_{#BW$b3||ItZ`LOw@urhnsgzpgumE+K9m5jMr zbc! zvyM|*$Rh>kX75A+KeOIJAM?oie^ZYX*lQknT){hh+MM)kuA`XP@ zD4dqqrYyR498N3b8U-Z2Z17@RL@MYR%0dvfK~(Y3^}Gu1FFs6Lxyt-5;#HV;(KO)( z6^Kh{@QIxwY_(P1)hZVcl<3QXx^6@5=6hsKX@1$=1;(8G)X<{4-&gseqD(y~O z+tR&gje{-x$AYz*Ei2wj48F12(Y-)XN|v&kW|dh@;#g{siu9$GZ*Nx=jpI0a05(AH zbb^qi@2Y&KI}y24PiDv>jMzyP!Q@jI|*AdX8PGUG5x}I+;qY8$Ho@Z-vUVD z_u01ZZZCJAHtCGkld8^hq0|y&o%3PBS9EEH{-aFw(xCp3%BnWUxsMyv-O3zAC`D+v zPrIbOkL!*b@3u!ee;Z6p4kdq)EVXKLKliG1wzm#U?VoCzYMg4A+Bap+^GxxcRmtKa z4a=~{^~)_nv<16IswrJVV+wIK%cWjxI!#2QDD6^fRoE!i1YyYbkr&E7RYw)OxUH7UlPvi;w2&VI+s($4x@DC z{hw1h!p+rLc)F|WDH?zEMm*Iu4=Ll3nvJwjTCt;BC=Kjf79R-G`^20#mQL6XyEL}5 zgKi&}Z)W(AoXB21KtoTN#14j$au^+I@+!tNAatlOKnb)w3PglyjNImJsjkQBNqf7Lq{C+5;q*pTo_Fj z*b%m0bL!NRHB5Z8>}@8ju76gH4>>>iHWjk7kQrsw$?NjyL`ly4Q>RkWSyUs78uRDO zD9p~|)C22AzZ5uXQ=rEYqMRc{x#h%MynD1DO4#s`IbO)X_X}P%N8krAoz)lXuzwJk z&tDjw&tFWP&wD=+B?;p>2Y)KWTm+xvKP{NQe(}V7zW=rL|LEthUo^kMBjG{oJbn#( z0B~O<0EJH`UgHJ6BAK~_9=WCR&dU8UIOYdFl+I5+exq(HwxVntD)WCr#%uzt`9D^U j(^Jv^Lddp?kN^+z=f8RLh>Ea?ia&c=Ppy)BN=yF_f460r diff --git a/include/world.h b/include/world.h index 26038c0..7684a10 100755 --- a/include/world.h +++ b/include/world.h @@ -115,7 +115,7 @@ cell_t* worldGetCell(int x, int y); void cellDraw(int cx, int cy, int sx, int sy, int plan); -void worldSet(int w, int h, int x, int y, cell_t const * a); +void worldSet(int w, int h, int x, int y, cell_t * a); void worldDraw(); void worldMove(); @@ -134,7 +134,7 @@ typedef struct int h; int start_x; int start_y; - cell_t data[]; + cell_t* data; }map_t; extern map_t * map_current; diff --git a/src/level.c b/src/level.c index b1ba22e..8a92dac 100644 --- a/src/level.c +++ b/src/level.c @@ -329,7 +329,9 @@ static void unpackLevel(packed_level_t * p) ll_sendp(LEVEL_INFO, "\n[i]Converted!\n[i]Sending to level zone...", w,h); worldSet(w, h, sx, sy, c); ll_sendp(LEVEL_INFO, "\n[i]Achieved unpacking", w,h); - freeProf(c); + + // Don't free c, it will be automatically managed by the worldSet function + //freeProf(c); EnnemiesInit(ennemis, nombre_ennemis); diff --git a/src/world.c b/src/world.c index 90e1dbb..f8d11f2 100755 --- a/src/world.c +++ b/src/world.c @@ -179,7 +179,7 @@ void worldMove() teleportersActive(); } -void worldSet(int w, int h, int x, int y, cell_t const * a) +void worldSet(int w, int h, int x, int y, cell_t * a) { // Resets mario's vx mario.p.vx=mario.p.vy=0; @@ -187,24 +187,22 @@ void worldSet(int w, int h, int x, int y, cell_t const * a) // Free the previous map if (map_current) { + if (map_current->data) freeProf(map_current->data); freeProf(map_current); map_current=0; } // If the new map size is null => invalid map, return - if (0==w*h) - return; - - // Calculates the new struct size - int size= 4*sizeof(int) + sizeof(cell_t)*w*h; + if (0==w*h) return; // Copy map into ram - map_current=(map_t*)mallocProf(size); if (!map_current) mallocError(); + map_current=(map_t*)mallocProf(sizeof(map_t)); if (!map_current) mallocError(); // Copy the map to ram map_current->w = w; map_current->h = h; mario.p.x = map_current->start_x = x; mario.p.y = map_current->start_y = y; - memcpy(map_current->data, a, sizeof(cell_t)*w*h); + map_current->data=a; + //memcpy(map_current->data, a, sizeof(cell_t)*w*h); }