From: sparky4 Date: Wed, 23 Sep 2015 14:51:21 +0000 (-0500) Subject: ok wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=5e61851e7bb3c2e579db3e83c502dc51803799f4;p=16.git ok wwww modified: 16.exe modified: scroll.exe modified: src/16.c modified: src/scroll.c --- diff --git a/16.exe b/16.exe index 54c5bb42..1fbbd08f 100755 Binary files a/16.exe and b/16.exe differ diff --git a/scroll.exe b/scroll.exe index 0aaefb0c..eab87201 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/src/16.c b/src/16.c index fac98bf9..c9cd55d5 100755 --- a/src/16.c +++ b/src/16.c @@ -22,16 +22,19 @@ #include "src/16.h" +global_game_variables_t gvar; +engi_stat_t engi_stat; +const char *cpus; +byte *dpal, *gpal; +player_t player[MaxPlayers]; +//page_t screen; + void main(int argc, char *argv[]) { - global_game_variables_t gvar; - engi_stat_t engi_stat; - const char *cpus; - byte *dpal, *gpal; - player_t player[MaxPlayers]; - + //screen = modexDefaultPage(); engi_stat = ENGI_RUN; + //textInit(); /* save the palette */ dpal = modexNewPal(); @@ -46,6 +49,7 @@ main(int argc, char *argv[]) modexPalBlack(); //so player will not see loadings~ IN_Startup(); IN_Default(0,&player,ctrl_Joystick); + //modexprint(&screen, 32, 32, 1, 2, 0, "a"); while(ENGI_EXIT != engi_stat) { IN_ReadControl(0,&player); @@ -58,8 +62,10 @@ main(int argc, char *argv[]) case 2: cpus = "386 or newer"; break; default: cpus = "internal error"; break; } - printf("detected CPU type: %s\n", cpus); VGAmodeX(0, &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); IN_Shutdown(); modexFadeOn(4, dpal); } diff --git a/src/scroll.c b/src/scroll.c index 8a078365..02cdd8c6 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -42,8 +42,8 @@ void main() { // word panswitch=0, panq=1, pand=0; word panpagenum=0; //for panning! - int i; - static word paloffset=0; + unsigned int i; + //static word paloffset=0; const char *cpus; //static int persist_aniframe = 0; /* gonna be increased to 1 before being used, so 0 is ok for default */