X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvrstest.c;h=1037b7c92c43b1be25891adc9e3f8cf00cd0b625;hb=0af34abfbdfa70d51cf117fbb48e02915ab05ae0;hp=18353afbc468a5cb03706cb89cb1c2f5334c17bc;hpb=27159fe50f32964f4ab1c619c3fe2be021cd86a2;p=16.git diff --git a/src/vrstest.c b/src/vrstest.c index 18353afb..1037b7c9 100755 --- a/src/vrstest.c +++ b/src/vrstest.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -23,7 +23,7 @@ #include "src/lib/16_head.h" #include "src/lib/16_tail.h" #include "src/lib/16_vl.h" -#include "src/lib/16_sprit.h" +#include "src/lib/16_spri.h" #include "src/lib/16_pm.h" #include "src/lib/16_ca.h" #include "src/lib/16_mm.h" @@ -44,20 +44,19 @@ void main() //boolean baka; entity_t enti; //vrl1_vgax_offset_t * off, *off1; - struct vrs_container vrs; - vrl1_vgax_offset_t **vrl_line_offsets; +/* struct vrs_container vrs; vrl1_vgax_offset_t **vrl_line_offsets; uint32_t far *vrl_headers_offsets; uint16_t far *vrl_id_iter; uint32_t vrl_size; int num_of_vrl; struct vrl1_vgax_header far *curr_vrl; int size=0; - dbg_nointest=0; +*/ + dbg_nointest=0; Startup16(&gvar); - // What should be done by read_vrs: - CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar); +/* CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &gvar); // Insert sanity cheks later vrs.buffer = bigbuffer; @@ -93,7 +92,8 @@ void main() enti.spri->spritesheet = &vrs; - enti.spri->sprite_vrl_cont = malloc(sizeof(struct vrl_container)); + enti.spri->sprite_vrl_cont = malloc(sizeof(struct vrl_container));*/ + VRS_LoadVRS("data/spri/chikyuu.vrs", &enti, &gvar); i = set_anim_by_id((enti.spri), 31); if (i == -1) { @@ -120,7 +120,7 @@ void main() t2 = (*clockw-start)/18.2; /*modexLoadPalFile("data/spri/chikyuu.pal", &pal); - modexPalUpdate1(pal);*/ + modexPalUpdate(pal);*/ //modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 2); VL_LoadPalFile("data/spri/chikyuu.pal", &gvar.video.palette); for (i = 0; i < 10; i++){ @@ -155,7 +155,7 @@ void main() MM_Report_(&gvar); Shutdown16(&gvar); free(enti.spri->sprite_vrl_cont); - free(vrl_line_offsets); + free(enti.spri->spritesheet->vrl_line_offsets); MM_FreePtr(&bigbuffer, &gvar); //MM_FreePtr(&((void __based(sega)*)enti.spri->spritesheet->buffer), &mm); //printf("CPU to VGA: %f\n", t1); @@ -167,7 +167,7 @@ void main() printf("t2: %f\n", t2); //0000 printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width); //0000 printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height); - printf("Num %d", num_of_vrl); +// printf("Num %d", num_of_vrl); // if(baka) printf("\nyay!\n"); // else printf("\npoo!\n"); }