wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack...

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index e638df1b06c0677b09dce6d45fe3b32e956024a8..dd2db336a03f7457967c519b40f49f179dc0a540 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -23,6 +23,7 @@
 #include "src/lib/scroll16.h"\r
 #include "src/lib/16_timer.h"\r
 #include "src/lib/wcpu/wcpu.h"\r
+#include "src/lib/mapread.h"\r
 \r
 //#define FADE\r
 #define MODEX  //this is for mode x initiating\r
@@ -47,7 +48,7 @@ boolean panswitch=0;
        //map_view_db_t pgid[4];\r
        word pg;\r
 //#ifdef FADE\r
-       static word paloffset=0;\r
+       //static word paloffset=0;\r
        byte *dpal;\r
 //#endif\r
        byte *gpal;\r
@@ -56,7 +57,7 @@ boolean panswitch=0;
 \r
 void main(int argc, char *argv[])\r
 {\r
-       byte *mesg=malloc(sizeof(dword));\r
+       //byte *mesg=malloc(sizeof(dword));\r
 \r
        if(argv[1]) bakapee = atoi(argv[1]);\r
        else bakapee = 1;\r
@@ -177,7 +178,7 @@ void main(int argc, char *argv[])
        //default player position on the viewable map\r
        player[0].tx = mv[0].tx + mv[0].page->tilemidposscreenx;\r
        player[0].ty = mv[0].ty + mv[0].page->tilemidposscreeny;\r
-       IN_initplayer(&player, 0);\r
+       IN_initplayer(&player);//, 0);\r
        //IN_initplayer(&player, 1);\r
 \r
 #ifndef        SPRITE\r
@@ -220,7 +221,7 @@ void main(int argc, char *argv[])
        //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\r
 \r
        //player movement\r
-               IN_ReadControl(0,&player);\r
+               IN_ReadControl(/*0,*/&player);\r
        if(!panswitch){\r
                walk(mv, player, 0);\r
        }else{\r