From a3c3026ef9a11550e4796db258e73c14f5f0b0da Mon Sep 17 00:00:00 2001 From: sparky4 Date: Tue, 9 Dec 2014 16:28:00 -0600 Subject: [PATCH 1/1] wwww XMS library expewrimentation We seriously need a proper XMS library! modified: scroll.exe modified: src/scroll.c --- scroll.exe | Bin 52118 -> 52118 bytes src/scroll.c | 23 ++++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scroll.exe b/scroll.exe index cb6e36971f7e3921b048cc3b49eaae37eb0833f7..8912afb4be416bc624556647bd611d1efe2c8da9 100644 GIT binary patch delta 4999 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 Ip0(2d0BZmnd;kCd delta 5061 zcmZu!30RZYnm#8d5OxBA5W<>}unPi}B2=($8>J*@ppiwYMlTztXN zOE`#~``n!Tg89~O>iZppi;c4C9@%t{xKAQ&`Hvi8!qrD`nbBukh~pAz>R3O*eGU(p zV!_isO}Zbfx?@7SUuZwK@ywvZigxA^?oLc&Z*zB3?LV-)$us|se-27Gvx++r#9fWD z={PPT+Lq7pSw0GH>R3L)ZG$RtGCdDR#gml7O}fvmy5G`nr(MT6a0UKOG|bI{Vey~c zhi!QxZVedS!o7!WW|8&0b%5I|hcdS?c*D)JxI*q2A$o_D=sTt4oSvN36I+$wv*7>J z4Drz>%58+y%Jn&LLt9P<9+a&nd+m-G6K$qVm81WAAZcz%^^n_~!m5*y~1zxUf zv)x_UbnY%Mksr=22*kb%B*Lb>>j^^$vfk=XN@!y?TclC5uzqt#_oMROysj z^p2-ddXbkLvk)ysByzMNnk%3Hk)E5zqsHre9bd5Cp~Q60J~mmkG1dz7%R=#$dn8I zxND@us{84pZW!wlzQQlPQ z@E}|QZ)z(NStWhSa~@9PX`=~wb3y0qZBZAeh@#=1G&J!`@gr{-081SsT2`X!`>gutuv9W)cs7)_8(=XdSywYyf` zaGytBNPfujke5O%wZE`xy{+(2W%XX|fxm@Uaa(92*PGgxpwYHJtIc1Xy$$cCM9RKO?i7)?az9cn&^z$K@+Vv=45ZAV)$nZU9GqrLY8DpT)zmZi zRBapEOg{s8+AdlL$J3%|8eB=srNQ8xK7kIwwDe>e4OQvY^mllWzJ^|e=QFgSHv+6Z z6GlcVWq4WPK}g50aM9um+^6trMg&#E+ZjvgHBdgW+jnw+rFNK@J#2X%_(+_4A~O)r z?Zv*C%7HpmAR1q z3MHBI=@B@a`LCozKR$nU-AwmrJnL!Kf35mO*y9WQBc}9nMd`;VyX{{-nL{Tv_*n)= zDz&^%*i!4O=e>5%Dp%_Hx0nG&_&>!oOuF(I)sfTP^#u zH|7b!yhVlldyiw}faMfr`+H&O5%No(L~Qo0E0GKel~^}ZLOVap#)=!T4syA^)*fLI z1q15k*S-dv>jp> z=F>Iy4GYzjK4m|==oY2V!@4C=^0}YjXU+eZ_1LR@54nl=xw{~d5M_SrPkRa zN)Aw8O(K3zMW363E$gtqUwY9qz4m7bA=fD-WOcD=B@ykcc}$cSuR^&Z-pyrDZmvN2 zC3{y{lZZya%!+KPfNd2|vM6akoUaIF8Pa=jr(#mHI$&9Vp~IVyF#(GM2r+z!urAwSu}OyS9dGd=l3QisAi?4a3MXV@m{_S5 z`vfHh!~Uui4?~e3A(25baIi9+{WHiHu2&|o#NZ<^T&ZU{!TaF3s>$p~a31Wdn#A4= zo(OlU)IL82$IA_S{0SKhR)cqS0?U*4qd^)hua>g;@^4{Xwc2NoyjN}*Cne;d{CzlH zoy_{>05_}K*za;1Y_Ew;$_v>ZLJZSzT`q_8A)1S5C?rxr3`-HEC}tyi5mAw%-hR7g z31y(T4B0O!*=ve!d%;UjQ|V>J!B8UFp)yQogxpr_hGXk0eW!&Mgko4^%%P1Czdl}i zFtp2QR*z&`XgfT=ew#;Es8-4QLh*)R$pkSWS3@JfdqWP>D&K@@8`4;o@;_k1h6(IV zWj(yJLCHQ)*1)X|n^}EWI~3PuG6;Je_ScSK?P2%fN^Kas9QHMEDBlnJ85A3rv0>zE zH@?kY3qJu9>Jr62hmVhdyPHyAUtJ}0kH~<4`c(1wh$WG**i!3p&6AMn5%VJ9@0LDj z-xSA|L>`8(Ha*K$NA3r$C7m6P?1e=Z3p*Wo$$r-oLRoLr?=ZNzk^MdDXRvPhn*AP~ z1?5}EFsW)R9NwD1vQ*_LCrBc2gJ-Cg!w_=is^bE;7CDRR2rSr^$d0S-3Ebz%y{)

L4{SoWdPfs@JLwClSP|3)O}r2%b?-N8JfT`RYR0 z-jK}d)gMA$z)9qwA+#< z=4rYF@)9lQi=3_$#*-_EDnG@=8VQxMrWCZ43JlD!&E zW7vY=mgW}Py^QEv&9`=AqlHQzYF^fg_yhbpUOS%JI-t#yB45@TWBH+8qE&00BWUE8 zE=felQEe$a-yGz7QhQfR42j6}BU9fzff-}F;Cyo;+Z5Ywf6%;D#JXbR?A1GSsrXuK zR2=ActKf@WPchH9C1 zgW#RGt8gBTzlu}B0A#U8aeF<^S7fF&hFz(=o4@tu~iG=Uf*aNoNV?trQ#BryT+XUe>= z_>1Pwn?YFa|B`3tPoATjIlG{UFb%xW5=)nWwIzl&z$wJ9!>28Afgg`Ln93@RC1_X- zzI)>7ddS=pAKaQW8r`_Mc-5-1WvFij)1JQu@xQg5d6${Y#T8~$Bth!l2w8s0sG_K} zW(ChzLebtxnd1+B%H(-@a|!E)9eWk{Q}y`XWJS+ot%*-mw5+V86kU7Z{@!%iW915? zIV-aUc^#zh)6x=HuunscuwkE?*1+L?>ae<0{+;4i!&r$?gaK5Tjp$JaclL$jMdBKq zYiNhSYyVxsuMC1uW3sQQC6Ew40}lvNvxOy-Kx;??MP1$qzU z(tZeNO`v-qr!|%S1y;5u(>B=Ks-=^mt5q3RpY=FjMX9OO{KrW4!H=z)@crW-XB8H= zdWCs;(Q4C+82+F=<6xeMI-ur|mZrk1hqUs~vR%=HMJTT{^C#W8!s8{9<(cQ;e;Q&s(3H k8$WY1e0Sk6u1Ldsg%s@Hy?2P>=4|_*iFVn8FV>6y8(zRW=l}o! diff --git a/src/scroll.c b/src/scroll.c index e67fe514..80b6fc3b 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -84,12 +84,6 @@ void main() { actor_t player; //actor_t npc0; - /* save the palette */ - pal = modexNewPal(); - modexPalSave(pal); - modexFadeOff(4, pal); - modexPalBlack(); - /* create the map */ map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly initMap(&map); @@ -101,7 +95,14 @@ void main() { ptr = map.data; /* data */ ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite - //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite + //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite + + /* save the palette */ + pal = modexNewPal(); + modexPalSave(pal); + modexFadeOff(4, pal); + modexPalBlack(); + setkb(1); modexEnter(); modexPalBlack(); @@ -498,7 +499,7 @@ allocMap(int w, int h) { result.height=h; if(initxms()>0) result.data = malloc(sizeof(byte) * w * h); - else result.data = xmsmalloc(sizeof(byte) * w * h); + else (void huge*)result.data = xmsmalloc(sizeof(byte) * w * h); return result; } @@ -512,17 +513,17 @@ initMap(map_t *map) { int tile = 1; if(initxms()>0) map->tiles = malloc(sizeof(tiles_t)); - else map->tiles = xmsmalloc(sizeof(tiles_t)); + else (void huge*)map->tiles = xmsmalloc(sizeof(tiles_t)); /* create the tile set */ if(initxms()>0) map->tiles->data = malloc(sizeof(bitmap_t)); - else map->tiles->data = xmsmalloc(sizeof(bitmap_t)); + else (void huge*)map->tiles->data = xmsmalloc(sizeof(bitmap_t)); map->tiles->data->width = (TILEWH*2); map->tiles->data->height= TILEWH; if(initxms()>0) map->tiles->data->data = malloc((TILEWH*2)*TILEWH); - else map->tiles->data->data = xmsmalloc((TILEWH*2)*TILEWH); + else (void huge*)map->tiles->data->data = xmsmalloc((TILEWH*2)*TILEWH); map->tiles->tileHeight = TILEWH; map->tiles->tileWidth =TILEWH; map->tiles->rows = 1; -- 2.39.2