oops wwww

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 8279a20e10a17cb8ce9eb5a26641563a20d126a8..b30c74f00217c7b7a919243d7e8fd76a427aeeec 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,29 +1,11 @@
 #include "src/lib/dos_kb.h"\r
 #include "src/lib/mapread.h"\r
-//#include "16\lib\x\modex.h"\r
 #include "src/lib/wtest/wtest.c"\r
 #include "src/lib/planar.c"\r
 //====#include "src\lib\ems.c"\r
-\r
+
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
 \r
-/*typedef struct {\r
-       bitmap_t *data;\r
-       word tileHeight;\r
-       word tileWidth;\r
-       unsigned int rows;\r
-       unsigned int cols;\r
-} tiles_t;\r
-\r
-\r
-typedef struct {\r
-       byte    *data;\r
-       tiles_t *tiles;\r
-       int width;\r
-       int height;\r
-} map_t;*/\r
-\r
-\r
 typedef struct {\r
        map_t *map;\r
        page_t *page;\r
@@ -70,8 +52,8 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 //place holder definitions\r
 //#define MAPX 200\r
 //#define MAPY 150\r
-#define TRIGGX 10\r
-#define TRIGGY 9\r
+//#define TRIGGX 10\r
+//#define TRIGGY 9\r
 \r
 void main() {\r
        size_t oldfreemem=GetFreeSize();\r
@@ -90,7 +72,7 @@ void main() {
        map_view_t mv, mv2, mv3;\r
        map_view_t *bg, *spri, *mask;//, *tmp;\r
        byte *dpal, *gpal;\r
-       byte huge *ptr;
+       byte *ptr;
        byte *mappalptr;\r
        actor_t player;\r
        //actor_t npc0;\r
@@ -124,9 +106,9 @@ void main() {
 \r
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
-//0000 fprintf(stderr, "testing~\n");\r
+//0000 fprintf(stderr, "testing~\n");
        loadmap("data/test.map", &map);
-//0000 fprintf(stderr, "yay map loaded~~\n");\r
+//0000 fprintf(stderr, "yay map loaded~~\n");
 //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r
@@ -138,13 +120,13 @@ void main() {
        ptr = map.data;\r
        mappalptr = map.tiles->data->palette;\r
        /* data */\r
-//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());\r
-       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite\r
+//0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
+       ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
-       \r
+\r
        /* create the planar buffer */\r
-//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());\r
-       p = planar_buf_from_bitmap(&ptmp);\r
+//0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
+       p = planar_buf_from_bitmap(&ptmp);
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());\r
 \r
        /*if(isEMS())\r
@@ -893,7 +875,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
        {\r
        rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
        ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
-       printf("i=%d\n", i);\r
+////0000       printf("i=%d\n", i);\r
        //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);\r
        modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));\r
        }\r