X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2F16.c;h=bfe777e253ad2ed5b686b1b9be92fd29e54c4cc3;hb=54e80274a159f2c8f12bbb284403927616c686c5;hp=154714deb2d165cff2d7640af2c29aa51836c6c3;hpb=b6ae782dca4da6013125ca45de50dca773989385;p=16.git diff --git a/src/16.c b/src/16.c index 154714de..bfe777e2 100755 --- a/src/16.c +++ b/src/16.c @@ -1,5 +1,5 @@ /* 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. * @@ -27,14 +27,13 @@ engi_stat_t engi_stat; const char *cpus; byte *dpal, *gpal; player_t player[MaxPlayers]; -page_t screen; +//page_t screen; void main(int argc, char *argv[]) { //screen = modexDefaultPage(); engi_stat = ENGI_RUN; - gvar.clock_start=*clockdw; //textInit(); /* save the palette */ @@ -46,17 +45,15 @@ main(int argc, char *argv[]) /*modexPalSave(gpal); modexSavePalFile("data/g.pal", gpal);*/ printf("wwww loop wwww\n"); - VGAmodeX(1, &gvar); + VGAmodeX(1, 1, &gvar); modexPalBlack(); //so player will not see loadings~ IN_Startup(); IN_Default(0,&player,ctrl_Joystick); - //modexprint(&screen, 32, 32, 1, 2, 0, "a"); + //modexprint(&screen, 32, 32, 1, 2, 0, "a", 1); while(ENGI_EXIT != engi_stat) { IN_ReadControl(0,&player); if(IN_KeyDown(sc_Escape)) engi_stat = ENGI_EXIT; - shinku(&screen, &gvar); - gvar.tiku++; } switch(detectcpu()) { @@ -65,7 +62,7 @@ main(int argc, char *argv[]) case 2: cpus = "386 or newer"; break; default: cpus = "internal error"; break; } - VGAmodeX(0, &gvar); + VGAmodeX(0, 1, &gvar); printf("Project 16 16.exe. This is supposed to be the actual finished game executable!\n"); printf("version %s\n", VERSION); printf("detected CPU type: %s\n", cpus);