modified: BITMAP.C

	modified:   pcxtest.exe
	modified:   scroll.c
	modified:   scroll.exe
	modified:   test.exe
	modified:   test2.exe

diff --git a/BITMAP.C b/BITMAP.C
index 191b460b772320271a8fb4e2412223b1182acd48..8287e57d252a2554813b7dc828358b1f8d7f7cba 100644 (file)
--- a/BITMAP.C
+++ b/BITMAP.C
@@ -79,10 +79,10 @@ bitmapLoadPcx(char *filename) {
 \r
     /* open the PCX file for reading */\r
     file = fopen(filename, "rb");\r
-    /*if(!file) {\r
+    if(!file) {\r
        printf("Could not open %s for reading.\n", filename);\r
        exit(-2);\r
-    }*/\r
+    }\r
 \r
     /* load the first part of the pcx file */\r
     loadPcxStage1(file, &result);\r

diff --git a/pcxtest.exe b/pcxtest.exe
index d1d39402e16f2ef987133f3dbfc665fa8a12334a..de765ece05216f2d419837866388d044bac54429 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.c b/scroll.c
index 057a5ee549df0a0edba744805f4e9c7b445d15fd..4ce0eca0c54405d59e2b8879927e4b4aa9524174 100644 (file)
--- a/scroll.c
+++ b/scroll.c
@@ -479,7 +479,7 @@ animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int
        short loo = (ls + lo);
 \r
        if(d2==0) qq = 0;\r
-       else qq = ((ls+1)*SPEED);\r
+       else qq = ((ls)*SPEED);\r
        switch (d1)\r
        {\r
                case 0:\r
@@ -503,14 +503,11 @@ animatePlayer(map_view_t *src, map_view_t *dest, short d1, short d2, int x, int
                        y=y-TILEWH;\r
                break;\r
        }
-       //TODO: make flexible animation thingy\r
-       if(2>ls && ls>=1) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-       modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else\r
-       if(3>ls && ls>=2) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else\r
-       if(4>ls && ls>=3) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-       modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else\r
-       if(5>ls && ls>=4) { modexCopyPageRegion(dest->page, src->page, x-2, y-4, x-2, y-4, 28, 40);\r
-       modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
+       //TODO: make flexible animation thingy
+       modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);\r
+       if(2>ls && ls>=1) { modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else\r
+       if(3>ls && ls>=2) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else\r
+       if(4>ls && ls>=3) { modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else\r
+       if(5>ls && ls>=4) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
        modexWaitBorder();\r
 }\r

diff --git a/scroll.exe b/scroll.exe
index 98e9290dc543344e9aeb2131041750d07567b53f..110d9abd36ac3b5009b462a113dc3795b4395f3b 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/test.exe b/test.exe
index b417dca2c7f80ddab8f29d463d92ecf75c5ae446..99404b1a3666201b98a9dba2cbe162f0e6a6d49f 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index b061884dbb358bb15170a66effc9da0e4896669e..2b870eff82dc4159ec20cecb40d7e0287b92bca1 100644 (file)
Binary files a/test2.exe and b/test2.exe differ