i think this may work now wwww

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
old mode 100644 (file)
new mode 100755 (executable)
index d65782d..83e6ca4
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,7 +21,7 @@
  */
 
 #include "src/lib/scroll16.h"
-#include "src/lib/mapread.h"
+//#include "src/lib/mapread.h"
 #include "src/lib/wcpu/wcpu.h"
 
 //#define FADE
@@ -29,20 +29,23 @@
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
+global_game_variables_t gvar;
+static map_t map;
+player_t player[MaxPlayers];
+page_t screen, screen2, screen3;
+map_view_t mv[3];
+map_view_t *bg, *spri, *mask;//, *tmp;
+planar_buf_t *p;
+
 void main()
 {
 //     word panswitch=0, panq=1, pand=0;
-       global_game_variables_t gvar;
        word panpagenum=0; //for panning!
        int i;
        static word paloffset=0;
-       planar_buf_t *p;
        const char *cpus;
        //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
-       page_t screen, screen2, screen3;
-       static map_t map;
-       map_view_t mv[3];
-       map_view_t *bg, *spri, *mask;//, *tmp;
+
        //map_view_db_t pgid[4];
 #ifdef FADE
        byte *dpal, *gpal;
@@ -50,13 +53,14 @@ void main()
        byte *ptr;
        byte *mappalptr;
        byte *mesg=malloc(sizeof(dword));
-       player_t player[MaxPlayers];
 
        player[0].persist_aniframe=0;
        player[0].speed=4;
-
-       start_timer(&gvar);
-       gvar.frames_per_second = 60;
+       //0000printf("starting timer\n");
+//++++
+       //++++????start_timer(&gvar);
+//++++ gvar.frames_per_second = 60;
+//0000 printf("ok\n");
        //extern struct inconfig inpu;
 
 //     atexit(qclean());
@@ -72,6 +76,7 @@ void main()
        map.width=0;
        map.height=0;
        chkmap(&map, 1);
+//0000 printf("chkmap ok\n");
 //0000 fprintf(stderr, "yay map loaded~~\n");
        mv[0].map = ↦
        mv[1].map = ↦
@@ -82,15 +87,17 @@ void main()
        mappalptr = map.tiles->data->palette;
        /* data */
 //0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
-//++++ player[0].data = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+       player[0].data = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
        /* create the planar buffer */
 //0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
        p = planar_buf_from_bitmap(&player[0].data);
+//0000 printf("planar buffer ok\n");
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());
 
        /*      input!  */
+//0000 getch();
        IN_Startup();
        IN_Default(0,&player,ctrl_Joystick);
 
@@ -365,6 +372,7 @@ void main()
        VGAmodeX(0, &gvar);
        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);