From: sparky4 Date: Fri, 2 Dec 2016 18:18:31 +0000 (-0600) Subject: hmmm X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=9f5e9a27631814605de7f8151d7495dffb6b3f10 hmmm --- diff --git a/16_enti.h b/16_enti.h index a629a0ee..9152bf88 100755 --- a/16_enti.h +++ b/16_enti.h @@ -394,3 +394,24 @@ vrstest.exe : No more files WARNING: Cannot find 1 file 7z a -v64k /var/www/vrstest.exe.zip vrstest.exe rm -f *.err +[master 5b5b1d3] wwww 16_entity.h - + 5 files changed, 397 insertions(+), 1 deletion(-) + create mode 100755 16_enti.h + mode change 100644 => 100755 WHAT_WAS_CHANGED + rename src/lib/{16_entity.h => 16_enti.h} (100%) + mode change 100644 => 100755 + mode change 100644 => 100755 src/lib/tst.c +wcl -DTARGET_MSDOS=16 -DMSDOS=1 -DDEBUGSERIAL -q -bt=dos -wx -mh -0 -fpi87 -fo=.obj -d1 -wo -i"src/lib/doslib" -obmilr -oe=24 -out -oh -ei -onac -ol+ -ok -sg -st -of+ -zu -zdf -zff -zgf -zq -k32768 -zk0 -zc -zp8 -zm -c src/16.c +Error: Compiler returned a bad status compiling 'src/16.c' + Ultimate Packer for eXecutables + Copyright (C) 1996 - 2013 +UPX 3.91 Markus Oberhumer, Laszlo Molnar & John Reiser Sep 30th 2013 + + File size Ratio Format Name + -------------------- ------ ----------- ----------- + +Packed 0 files. +cat *.err +src/lib/16_in.h(237): Error! E1022: Missing or misspelled data type near 'entity_t' +src/16.c(81): Error! E1151: Parameter count does not agree with previous definition +src/16.c(81): Note! I2002: 'IN_ReadControl' defined in: src/lib/16_in.h(291) diff --git a/ca.use b/ca_use.txt similarity index 100% rename from ca.use rename to ca_use.txt diff --git a/data/g.pal b/data/g.pal index e67dd143..db4658dd 100755 Binary files a/data/g.pal and b/data/g.pal differ diff --git a/design.txt b/design.txt index efb3250f..6d265f0b 100755 --- a/design.txt +++ b/design.txt @@ -83,3 +83,4 @@ pointers from 2nd screen follows the 1st size and dimentions and stuff are the same but addresses are different data is different +https://www.quora.com/How-such-smooth-scrolling-was-achieved-in-games-like-Super-Mario-and-Commander-Keen diff --git a/mm.use b/mm_use.txt similarity index 100% rename from mm.use rename to mm_use.txt diff --git a/pm.use b/pm_use.txt similarity index 100% rename from pm.use rename to pm_use.txt diff --git a/src/lib/.16_head.h.kate-swp b/src/lib/.16_head.h.kate-swp new file mode 100755 index 00000000..070cc2c2 Binary files /dev/null and b/src/lib/.16_head.h.kate-swp differ diff --git a/src/lib/doslib b/src/lib/doslib index 90144463..8037bba4 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 901444632b77ab51350523d3b1198fdfbbab58a4 +Subproject commit 8037bba4c38f750e1599530d77e41ca1f80a6134 diff --git a/src/zcroll.c b/src/zcroll.c index 991217ca..83e320ff 100755 --- a/src/zcroll.c +++ b/src/zcroll.c @@ -63,20 +63,21 @@ void main(int argc, char *argv[]) player->ent->spri = malloc(sizeof(struct sprite)); player->ent->spri->spritesheet = malloc(sizeof(struct vrs_container)); - // create the map + // create the map fprintf(stderr, "testing map load~ "); loadmap("data/test.map", &map); chkmap(&map, 0); printf("chkmap ok "); fprintf(stderr, "yay map loaded~~\n"); - // data +//goto pee; + // data read_vrs(&gvar, "data/spri/chikyuu.vrs", player->ent->spri->spritesheet); - // input! + // input! IN_Default(0, player,ctrl_Joystick); - // save the palette + // save the palette dpal = modexNewPal(); modexPalSave(dpal); modexFadeOff(4, dpal); @@ -136,12 +137,12 @@ return; modexShowPage(mv->page);//!(gvar.video.p) shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible. - // buffer pages + // buffer pages // modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 47); // modexClearRegion(mv[3].page, 0, 0, mv[3].page->width, mv[3].page->height, 45); // { // unsigned int k,j,o; -// // fill screen with a distinctive pattern +// // fill screen with a distinctive pattern // for (k=0;k < vga_state.vga_width;k++) { // o = k >> 2; // vga_write_sequencer(0x02/*map mask*/,1 << (k&3)); @@ -221,7 +222,7 @@ return; if((player->q==1) && !(player->x%TILEWH==0 && player->y%TILEWH==0)) break; //incase things go out of sync! player->hp = 0; } - +//pee: /* fade back to text mode */ /* but 1st lets save the game palette~ */ modexPalSave(gpal);