From 5e61851e7bb3c2e579db3e83c502dc51803799f4 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 23 Sep 2015 09:51:21 -0500 Subject: [PATCH] ok wwww modified: 16.exe modified: scroll.exe modified: src/16.c modified: src/scroll.c --- 16.exe | Bin 53716 -> 54036 bytes scroll.exe | Bin 76802 -> 76802 bytes src/16.c | 20 +++++++++++++------- src/scroll.c | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/16.exe b/16.exe index 54c5bb42fa3f2b9b7aade533d71faca94aec88ad..1fbbd08fb739fd72a7006c83f537fa65569b44e7 100755 GIT binary patch delta 8532 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 WNy7%zW0=RiXuNzVLcb?-3He_*n-qco diff --git a/scroll.exe b/scroll.exe index 0aaefb0c09615e3cf1aa3ead73a46edc0ad8f30d..eab8720110678add34f6db69425d4db330ee2b34 100755 GIT binary patch delta 24 fcmZp=!P0btWdl1OtEqvNiBU5T-*z58#&5C!VnqiI delta 24 fcmZp=!P0btWdl1OtFf7tfnhTb-*z58#&5C!VnGKD 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 */ -- 2.39.5