/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
*
* This file is part of Project 16.
*
*/
#include "src/lib/scroll16.h"
-#include "src/lib/timer.h"
+#include "src/lib/16_timer.h"
#include "src/lib/wcpu/wcpu.h"
//#define FADE
static map_t map;
player_t player[MaxPlayers];
//page_t screen, gvar.video.page[1], gvar.video.page[2];
-map_view_t mv[3];
-map_view_t *bg, *spri, *mask;//, *tmp;
+map_view_t mv[4];
bitmap_t p;
-word pn=0;
+//word pn=0; //i forgot ww
static planar_buf_t huge *pp;
float t;
sword bakapee;
-
-// word panswitch=0, panq=1, pand=0;
- word panpagenum=0; //for panning!
+pan_t pan;
+//debugswitches
+boolean panswitch=0;
+boolean pageflipflop=1;
unsigned int i;
const char *cpus;
//static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */
if(argv[1]) bakapee = atoi(argv[1]);
else bakapee = 1;
- player[0].persist_aniframe=0;
- player[0].speed=4;
+ // DOSLIB: check our environment
+ probe_dos();
+
+ // DOSLIB: what CPU are we using?
+ // NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
+ // So this code by itself shouldn't care too much what CPU it's running on. Except that other
+ // parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
+ // the CPU to carry out tasks. --J.C.
+ cpu_probe();
+
+ // DOSLIB: check for VGA
+ if (!probe_vga()) {
+ printf("VGA probe failed\n");
+ return;
+ }
+ // hardware must be VGA or higher!
+ if (!(vga_state.vga_flags & VGA_IS_VGA)) {
+ printf("This program requires VGA or higher graphics hardware\n");
+ return;
+ }
+
+ if (_DEBUG_INIT() == 0) {
+#ifdef DEBUGSERIAL
+ printf("WARNING: Failed to initialize DEBUG output\n");
+#endif
+ }
+ _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
+
+ pan.pn=1;
//player[0].data = &pp;
- printf("starting timer\n");
+ printf("starting timer ");
start_timer(&gvar);
printf("ok\n");
- //extern struct inconfig inpu;
// atexit(qclean());
/* create the map */
- fprintf(stderr, "testing map load~\n");
+ fprintf(stderr, "testing map load~ ");
loadmap("data/test.map", &map);
chkmap(&map, 0);
- printf("chkmap ok\n");
+ printf("chkmap ok ");
fprintf(stderr, "yay map loaded~~\n");
- mv[0].map = ↦
- mv[1].map = ↦
- mv[2].map = ↦
/* draw the tiles */
#ifdef MODEX
ptr = map.data;
- mappalptr = map.tiles->data->palette;
+ //mappalptr = map.tiles->btdata->palette;
/* data */
- p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+ //++++p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
/* create the planar buffer */
////++++ (player[0].data) = *planar_buf_from_bitmap(&p);
- printf("load pee!!\n");
+ /*++++printf("load pee!! ");
pp = planar_buf_from_bitmap(&p);
- printf("done!\n");
+ printf("done!\n");*/
#endif
/* input! */
IN_Startup();
IN_Default(0,&player,ctrl_Joystick);
+ //IN_Default(1,&player,ctrl_Joystick);
/* save the palette */
#ifdef MODEX
#endif
textInit();
- VGAmodeX(bakapee, &gvar);
+ VGAmodeX(bakapee, 1, &gvar);
// printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
#ifdef FADE
modexPalBlack(); //reset the palette~
//++++ player[0].data.offset=(paloffset/3);
//++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
//modexPalUpdate1(p.palette);
- modexPalUpdate1(map.tiles->data->palette);
+//++++0000 modexPalUpdate1(map.tiles->btdata->palette);
//printf(" %d\n", sizeof(ptmp->data));
//printf("1: %d\n", paloffset);
//++++ map.tiles->data->offset=(paloffset/3);
#endif
/* setup camera and screen~ */
- gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
- gvar.video.page[0].width += (TILEWH*2);
- gvar.video.page[0].height += (TILEWH*2);//+QUADWH;
- mv[0].page = &gvar.video.page[0];
- gvar.video.page[1] = modexNextPage(mv[0].page);
- mv[1].page = &gvar.video.page[1];
-
- gvar.video.page[2] = modexNextPageFlexibleSize(mv[1].page, gvar.video.page[0].sw, gvar.video.page[0].sh); //(352*176)+1024 is the remaining amount of memory left wwww
- //gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww
- mv[2].page = &gvar.video.page[2];
-
+ modexHiganbanaPageSetup(&gvar.video);
+ for(i=0;i<gvar.video.num_of_pages;i++)
+ {
+ mv[i].page = &gvar.video.page[i];
+ mv[i].map = ↦
+ mv[i].video = &gvar.video;
+ mv[i].pan = &pan;
+ }
/* set up paging */
- bg = &mv[0];
- spri = &mv[1];
- mask = &mv[2];
-//IN_Ack();
-//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
- mapGoTo(bg, 0, 0);
- mapGoTo(spri, 0, 0);
- //mapGoTo(mask, 0, 0);
-//IN_Ack();
+ //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
+ mapGoTo(mv, 0, 0);
+ modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
+
//TODO: put player in starting position of spot
//default player position on the viewable map
- player[0].tx = bg->tx + bg->page->tilemidposscreenx;
- player[0].ty = bg->ty + bg->page->tilemidposscreeny;
- player[0].x = player[0].tx*TILEWH;
- player[0].y = player[0].ty*TILEWH;
- player[0].triggerx = player[0].tx;
- player[0].triggery = player[0].ty+1;
-/* player[0].info.x = player[0].tx;
- player[0].info.xaxis = player[0].tx*TILEWH;
- player[0].info.y = player[0].ty;
- player[0].info.yaxis = player[0].ty*TILEWH;*/
- player[0].q=1;
- player[0].d=2;
- player[0].hp=4;
-// player[0].persist_aniframe=0;
- //npc
- /*npc0.tx = bg->tx + 1;
- npc0.ty = bg->ty + 1;
- npc0.x = npc0.tx*TILEWH;
- npc0.y = npc0.ty*TILEWH;
- npc0.triggerx = npc0.tx;
- npc0.triggery = npc0.ty+1;
- npc0.q=1;
- npc0.d=0;
- modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
+ player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;
+ player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;
+ IN_initplayer(&player, 0);
+ //IN_initplayer(&player, 1);
- modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
#ifndef SPRITE
modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
#else
- //PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA);
- PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp);
+ //PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA);
+ PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp);
#endif
- modexShowPage(spri->page);
+ if(!pageflipflop) modexShowPage(mv[1].page);
+ else modexShowPage(mv[(gvar.video.p)].page);
+ shinku_fps_indicator_page = 1; // we're on page 1 now, shinku(). follow along please or it will not be visible.
//modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
#ifdef MODEX
#ifdef FADE
#endif
while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
{
- shinku(mv, &gvar);
- IN_ReadControl(0,&player);
+ shinku(&gvar);
//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
//when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
//player movement
- //if(!panswitch){
+ IN_ReadControl(0,&player);
+ if(!panswitch){
walk(mv, player, 0);
- /*}else{
-//88 switch!
- //right movement
- if((IN_KeyDown(77) && !IN_KeyDown(75) && pand == 0) || pand == 2)
- {
- if(pand == 0){ pand = 2; }
- if(panq<=(TILEWH/(player[0].speed)))
- {
- switch(panpagenum)
- {
- case 0:
- //bg
- bg->page->dx++;
- modexShowPage(bg->page);
- break;
- case 1:
- //spri
- spri->page->dx++;
- modexShowPage(spri->page);
- break;
- case 2:
- //fg
- mask->page->dx++;
- modexShowPage(mask->page);
- break;
- }
- panq++;
- } else { panq = 1; pand = 0; }
- }
- //left movement
- if((IN_KeyDown(75) && !IN_KeyDown(77) && pand == 0) || pand == 4)
- {
- if(pand == 0){ pand = 4; }
- if(panq<=(TILEWH/(player[0].speed)))
- {
- switch(panpagenum)
- {
- case 0:
- //bg
- bg->page->dx--;
- modexShowPage(bg->page);
- break;
- case 1:
- //spri
- spri->page->dx--;
- modexShowPage(spri->page);
- break;
- case 2:
- //fg
- mask->page->dx--;
- modexShowPage(mask->page);
- break;
- }
- panq++;
- } else { panq = 1; pand = 0; }
- }
- //down movement
- if((IN_KeyDown(72) && !IN_KeyDown(80) && pand == 0) || pand == 3)
- {
- if(pand == 0){ pand = 3; }
- if(panq<=(TILEWH/(player[0].speed)))
- {
- switch(panpagenum)
- {
- case 0:
- //bg
- bg->page->dy--;
- modexShowPage(bg->page);
- break;
- case 1:
- //spri
- spri->page->dy--;
- modexShowPage(spri->page);
- break;
- case 2:
- //fg
- mask->page->dy--;
- modexShowPage(mask->page);
- break;
- }
- panq++;
- } else { panq = 1; pand = 0; }
- }
- //up movement
- if((IN_KeyDown(80) && !IN_KeyDown(72) && pand == 0) || pand == 1)
- {
- if(pand == 0){ pand = 1; }
- if(panq<=(TILEWH/(player[0].speed)))
- {
- switch(panpagenum)
- {
- case 0:
- //bg
- bg->page->dy++;
- modexShowPage(bg->page);
- break;
- case 1:
- //spri
- spri->page->dy++;
- modexShowPage(spri->page);
- break;
- case 2:
- //fg
- mask->page->dy++;
- modexShowPage(mask->page);
- break;
- }
- panq++;
- } else { panq = 1; pand = 0; }
+ }else{
+ panpagemanual(mv, player, 0);
+ //printf(" player[0].q: %d", player[0].q); printf(" player[0].d: %d\n", player[0].d);
}
-}*/
-
- //the scripting stuf....
+ //the scripting stuff....
//if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
- if(((bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
+ if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
{
short i;
for(i=800; i>=400; i--)
}
if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
//debugging binds!
- //if(IN_KeyDown(0x0E)) while(1){ if(xmsmalloc(24)) break; }
- if(IN_KeyDown(2)){ modexShowPage(bg->page); panpagenum=0; }
- if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; }
- if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; }
- if(IN_KeyDown(25)){ pdump(bg->page); pdump(spri->page); } //p
+ if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
+ if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }
+ if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
+ if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
+ if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
+ //IN_Ack();
+ } //p
#ifdef MODEX
#ifdef FADE
- if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg->page); pdump(spri->page); }
+ if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
if(IN_KeyDown(22)){
paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
printf("1paloffset = %d\n", paloffset/3);
- modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+ modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
printf("2paloffset = %d\n", paloffset/3);
- pdump(bg->page); pdump(spri->page); }
+ modexpdump(mv[0].page); modexpdump(mv[1].page); }
#endif
#endif
//pan switch
- //if(IN_KeyDown(88)){if(!panswitch) panswitch++; else panswitch--; } //f12
+ if(IN_KeyDown(88)){panswitch=!panswitch;} //f12
//TSR
if(IN_KeyDown(87)) //f11
{
- VGAmodeX(0, &gvar);
- IN_Shutdown();
- __asm
- {
- mov ah,31h
- int 21h
- }
+ pageflipflop=!pageflipflop;
+ //IN_Ack();
+// VGAmodeX(0, 0, &gvar);
+// IN_Shutdown();
+// __asm
+// {
+// mov ah,31h
+// int 21h
+// }
}
- if(IN_KeyDown(88)) //s
+ if(IN_KeyDown(68)) //s
{
- switch(gvar.kurokku.fpscap)
- {
- case 0:
- gvar.kurokku.fpscap=1;
- break;
- case 1:
- gvar.kurokku.fpscap=0;
- break;
- }
- IN_Ack();
+ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
+ //IN_Ack();
}
//TODO fmemtest into page
- if(IN_KeyDown(4+1)) //4
+ /*if(IN_KeyDown(4+1)) //4
{
pg=1;
SELECT_ALL_PLANES();
_fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
- }
+ }*/
//9
if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
modexSavePalFile("data/g.pal", gpal);
modexFadeOff(4, gpal);
#endif
- VGAmodeX(0, &gvar);
+ VGAmodeX(0, 1, &gvar);
#endif
IN_Shutdown();
printf("Project 16 scroll.exe. This is just a test file!\n");
printf("version %s\n", VERSION);
- printf("tx: %d\n", bg->tx);
- printf("ty: %d\n", bg->ty);
- printf("player[0].x: %d", player[0].x); printf(" player[0].y: %d\n", player[0].y);
+ printf("tx: %d\n", mv[0].tx);
+ printf("ty: %d\n", mv[0].ty);
+ printf("player.x: %d", player[0].x); printf(" player.y: %d\n", player[0].y);
//if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
//else printf("\nplayer[0].y: %d\n", player[0].y);
- printf("player[0].tx: %d", player[0].tx); printf(" player[0].ty: %d\n", player[0].ty);
- printf("player[0].triggx: %d", player[0].triggerx); printf(" player[0].triggy: %d\n", player[0].triggery);
- printf("player[0].hp: %d", (player[0].hp)); printf(" player[0].q: %d", player[0].q); printf(" player[0].info.dir: %d", player[0].info.dir); printf(" player[0].d: %d\n", player[0].d);
- printf("tile data value at player trigger position: %d\n", bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
+ printf("player.tx: %d", player[0].tx); printf(" player.ty: %d\n", player[0].ty);
+ printf("player.triggx: %d", player[0].triggerx); printf(" player.triggy: %d\n", player[0].triggery);
+ printf("player.hp: %d", (player[0].hp)); printf(" player.q: %d", player[0].q); printf(" player.info.dir: %d", player[0].info.dir); printf(" player.d: %d ", player[0].d);
+ printf("pdir=%d\n", player[0].pdir);
+ printf("tile data value at player trigger position: %d\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
// printf("palette offset: %d\n", paloffset/3);
//++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize());
//++++ printf("Total free: %zu\n", GetFreeSize());
//not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
printf("Virtual Screen: %dx", gvar.video.page[0].width); printf("%d\n", gvar.video.page[0].height);
printf("Screen: %dx", gvar.video.page[0].sw); printf("%d\n", gvar.video.page[0].sh);
- printf("tile resolution: %dx", gvar.video.page[0].tilesh); printf("%d\n", gvar.video.page[0].tilesh);
+ printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw); printf("%d\n", gvar.video.page[0].tilesh);
+ printf("tile resolution: %dx", gvar.video.page[0].tw); printf("%d \n", gvar.video.page[0].th);
printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx); printf("%d\n", gvar.video.page[0].tilemidposscreeny);
-// printf("Screen2: %dx", gvar.video.page[1].width); printf("%d\n", gvar.video.page[1].height);
-// printf("map: %dx%d\n", map.width, map.height);
-// printf("\n");
-// printf("player[0].info.x: %d", player[0].info.xaxis); printf(" player[0].info.y: %d\n", player[0].info.yaxis);
-// printf("player[0].info.tx: %d", player[0].info.x); printf(" player[0].info.ty: %d\n", player[0].info.y);
- //printf("map.width=%d map.height=%d map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
+ modexprintmeminfo(&gvar.video);
+ printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf(" mv[%u].ty: %d ", pan.pn, mv[pan.pn].ty); printf("gvar.video.p=%u\n", gvar.video.p);
+ //printf("player[1].q: %d", player[1].q); printf(" player[1].d: %d\n", player[1].d);
+ printf("\n");
+ //printf("map.width=%d map.height=%d map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
+ printf("\n");
switch(detectcpu())
{
case 0: cpus = "8086/8088 or 186/88"; break;
projects / 16.git / blobdiff