IT'S WORKING!!!!!!!!!!!!!!! WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW...

	new file:   data/ed.png
	modified:   data/g.pal
	modified:   data/test.map
	modified:   data/test.tmx
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/mapread.c
	modified:   src/lib/modex16.c
	modified:   src/lib/modex16.h
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe

diff --git a/data/ed.png b/data/ed.png
new file mode 100644 (file)
index 0000000..7f743ee
Binary files /dev/null and b/data/ed.png differ

diff --git a/data/g.pal b/data/g.pal
index b9f6a3c50a58e6940b2beb149d4784e9787797fc..550e9fc6608863b6c31a8ec897796bfa57f5abd0 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/data/test.map b/data/test.map
index 3c9e82fd27e905d5df7019a2c8e8e1090e8c2ac7..c14592011a701f96e1f0f19ade1be8fb26236d37 100644 (file)
--- a/data/test.map
+++ b/data/test.map
@@ -2,7 +2,7 @@
  "height":30,
  "layers":[
         {
-         "data":[30, 30, 30, 30, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 30, 30, 30, 30, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 30, 30, 30, 30, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 30, 30, 30, 30, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 3, 87, 87, 87, 87, 87, 87, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 3, 87, 87, 87, 87, 87, 87, 87, 87, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 28, 3, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 87, 87, 87, 87, 87, 87, 87, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 26, 26, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 26, 26],
+         "data":[1, 2, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 12, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10],
          "height":30,
          "name":"bg",
          "opacity":1,
@@ -22,9 +22,9 @@
  "tilesets":[
         {
          "firstgid":1,
-         "image":"bakapi.png",
-         "imageheight":240,
-         "imagewidth":320,
+         "image":"ed.png",
+         "imageheight":64,
+         "imagewidth":64,
          "margin":0,
          "name":"wwww",
          "properties":

diff --git a/data/test.tmx b/data/test.tmx
index 6b0fbae65dc81d4f83129730ad711f16b3ad34f4..b1e03d996e697f5cb0088d74906ee76cb69428d6 100644 (file)
--- a/data/test.tmx
+++ b/data/test.tmx
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" backgroundcolor="#000000">
  <tileset firstgid="1" name="wwww" tilewidth="16" tileheight="16">
-  <image source="bakapi.png" width="320" height="240"/>
+  <image source="ed.png" width="64" height="64"/>
  </tileset>
  <layer name="bg" width="40" height="30">
   <data encoding="csv">
-30,30,30,30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-30,30,30,30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-30,30,30,30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-30,30,30,30,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,2,3,4,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+5,6,7,8,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+9,10,11,12,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+13,14,15,16,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,6,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,28,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,12,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,3,87,87,87,87,87,87,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,3,87,87,87,87,87,87,87,87,3,3,3,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,28,3,87,87,87,87,87,87,87,87,87,87,3,3,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,3,87,87,87,87,87,87,87,87,87,87,87,87,3,3,1,1,1,1,1,
-1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,3,87,87,87,87,87,87,87,87,87,87,87,87,87,3,1,1,1,1,
-1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,87,87,87,87,87,87,87,87,87,87,87,87,3,1,1,1,
-1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,3,87,87,87,87,87,87,87,3,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,1,2,3,4,3,3,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,1,1,3,1,1,1,1,5,6,7,8,6,6,6,6,6,3,3,3,1,1,1,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,9,10,11,12,6,6,6,6,6,6,6,6,3,3,3,1,1,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,13,14,15,16,3,6,6,6,6,6,6,6,6,6,6,3,3,1,1,1,1,1,1,1,
+1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,3,6,6,6,6,6,6,6,6,6,6,6,6,3,3,1,1,1,1,1,
+1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,3,6,6,6,6,6,6,6,6,6,6,6,6,6,3,1,1,1,1,
+1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,6,6,6,6,6,6,6,6,6,6,6,6,3,1,1,1,
+1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,3,6,6,6,6,6,6,6,3,1,1,1,
 1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,3,3,3,3,3,3,3,1,1,1,
 1,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,3,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -33,8 +33,8 @@
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,26,26,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,26,26
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,10,10,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,10,10
 </data>
  </layer>
 </map>

diff --git a/pcxtest.exe b/pcxtest.exe
index 2cff9040eed08ce8f9e66a1c69a97796e622ccda..cd2e89cb17286f24dc3520bf8a42be18406a1f4a 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 87e392effc8b07124a0c3b2b31bde3b4bc447104..44ff38b1ffab75d4c95b49a1d11d9abd3ebe3f68 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index d1187795bb906b1ac42f3184175e86d84e40b1b9..d3fdbdaec3bc911af675fb5012b85b94b62224d1 100644 (file)
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -26,7 +26,7 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *
 
                                FUCK well i am stuck.... wwww
                        */
-                       map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10)%4;
+                       map->data[q] = (byte)strtol(js+t->start, &(char *)t->end, 10);
 //                     printf("%d[%d]", q, map->data[q]);
                }
                else

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index e346ab3e6204f3167614ca22a067e3f086460ea5..78b5c36977e5ceaea1e1c4f76d66d53f4a172fdf 100644 (file)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -591,16 +591,17 @@ modexPalWhite() {
 
 /* utility */
 void
-modexPalUpdate(bitmap_t *bmp, word *i, word qp, word qr)
+modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp)
 {
        byte *p = bmp->palette;
        word w=0;
        word q=0;
        word qq=0;
-       word *qqqq;
+       word ii;
        static word a[256] = { 0 };
        word z=0,aq=0,aa=0;
-       word pp=0,aqpp=0,spee=0,ppee=0;
+       word pp=0,spee=0,ppee=0;
+       sword aqpw;
 
 //     if(qp>0) printf("(*i)=%02d\n", (*i));
        modexWaitBorder();
@@ -608,23 +609,14 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word qr)
        else if(qp==0)
        {
                q=(*i);
-               (*qqqq)=(*i)-q;
-               //mxi1=PAL_SIZE/2;
-               //mxi2=PAL_SIZE;
        }
        else
        {
                q=(*i);
                qq=(*i)/3;
-               (*qqqq)=(*i)-(bmp->offset*3);
-               //mxi1=q+3;
-               //mxi2=q+3;
 //             printf("q: %02d\n", (q));
-               //printf("mxi1: %02d\n", mxi1);
 //             printf("qq: %02d\n", (qq));
-               //printf("      ((*i)-(bmp->offset*3))=%02d\n", ((*i)-(bmp->offset*3)));
                //printf("      (*i)-q=%02d\n", (*i)-q);
-//             printf("qqqq: %d\n",(*qqqq));
 //             printf("================\n");
                outp(PAL_WRITE_REG, qq);  /* start at the beginning of palette */
        }
@@ -634,39 +626,45 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word qr)
                {
                        //if(i%3==0 && (p[i+5]==p[i+4] && p[i+4]==p[i+3] && p[i+3]==p[i+2] && p[i+2]==p[i+1] && p[i+1]==p[i] && p[i+5]==p[i]))
 //____                 if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
-                       if((((*i)-q)%3==0 || ((qp>0)&&((*i)-(bmp->offset*3))%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
+                       if(((((*i)-q)%3==0) || ((qp>0)&&((*i)-(bmp->offset*3))%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
                        {
-                               printf("[%d]", p[((*i)-q)]);    printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]);
+                               if(qp>0)
+                               {
+                                       (*i)-=(aqpp*3);
+                                       aqpw=aqpp-1;
+                                       outp(PAL_WRITE_REG, qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
+                                       for(ii=aqpp; ii>0; ii--)
+                                       {
+                                               outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]);
+                                               outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+1)-(bmp->offset*3))]);
+                                               outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+2)-(bmp->offset*3))]);
+//                                             printf("position        =       %d\n", qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
+/*if(qp>0){ //printf("[%d]", p[((*i)-q)]);     printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]); }
+printf("[%d]", p[((((*i)+((aqpp-ii)*3)))-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3))]);
+printf("[%d] | ", p[((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+3)-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+4)-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+5)-(bmp->offset*3))]);
+printf("       %d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]); }*/
+                                               //printf("%d\n", ((*i)+((ii)*3))/3);
+                                               //printf("ii=%d\n", ii);
+                                               //printf("aqpp=%d\n", aqpp);
+                                               //printf("                      %d\n", ((*i)+((aqpp-ii)*3))/3);
+                                       }
+                                       //printf("      %d\n",((((*i)+((aqpp-ii)*3)))-(bmp->offset*3)));
+                                       //printf("      %d\n",((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3)));
+                                       //printf("      %d\n",((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3)));
+                                       //printf("(*i)=%d\n", (*i));
+                               }
+                               //printf("[%d]", p[((*i)-q)]);  printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]);
                                w++;
                                break;
                        }
                        else
                        {
-                               /*if(qp>0)
-                               {
-                                       printf("        ((*i)-(bmp->offset*3))=%02d\n", ((*i)-(bmp->offset*3)));
-                               }*/
-                               /*if(q>0 && qp==0)
-                               {
-                                       printf("(*i)-q=%02d", (*i)-q);
-                                       printf("[%d]", p[((*i)-q)]);    printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]);
-                               }*/
                                if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
                                else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))]);
-                               /*if(q>0 && qp==0)
-                               {
-                                       qq=(*i)-q;
-                                       chkcolor(bmp, &q, &a, &aa, &z);
-                                       if(a[(*i)-q]==0)
-                                       {
-                                               printf("%d      qqqq\n", qq);
-                                               outp(PAL_DATA_REG, p[(*i)-q]);
-                                       }
-                               }
-                               else
-                               {
-                                       outp(PAL_DATA_REG, p[(*i)-q]);
-                               }*/
                        }
                }
        }
@@ -676,151 +674,138 @@ modexPalUpdate(bitmap_t *bmp, word *i, word qp, word qr)
                for(; (*i)<PAL_SIZE; (*i)++)
                {
 //____                 if((qp>0)&&((*i)-q)%3==0 && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5])) outp(PAL_DATA_REG, p[(*i)-q]); else
-                       if((((*i)-q)%3==0 || ((qp>0)&&((*i)-(bmp->offset*3))%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
+                       if(((((*i)-q)%3==0) || ((qp>0)&&((*i)-(bmp->offset*3))%3==0)) && (p[((*i)-q)]==p[((*i)-q)+3] && p[((*i)-q)+1]==p[((*i)-q)+4] && p[((*i)-q)+2]==p[((*i)-q)+5]))
                        {
-                               printf("[%d]", p[((*i)-q)]);    printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]);
+                               if(qp>0)
+                               {
+                                       (*i)-=(aqpp*3);
+                                       aqpw=aqpp-1;
+                                       outp(PAL_WRITE_REG, qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
+                                       for(ii=aqpp; ii>0; ii--)
+                                       {
+                                               outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]);
+                                               outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+1)-(bmp->offset*3))]);
+                                               outp(PAL_DATA_REG, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3)+2)-(bmp->offset*3))]);
+//                                             printf("position        =       %d\n", qq+(((*i)+(aqpw*3)-(bmp->offset*3))/3));
+/*if(qp>0){ //printf("[%d]", p[((*i)-q)]);     printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]); }
+printf("[%d]", p[((((*i)+((aqpp-ii)*3)))-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3))]);
+printf("[%d] | ", p[((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+3)-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+4)-(bmp->offset*3))]);
+printf("[%d]", p[((((*i)+((aqpp-ii)*3))+5)-(bmp->offset*3))]);
+printf("       %d [%d]\n",((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))/3, p[((((*i)+((aqpp-ii)*3))+((aqpp+ii)*3))-(bmp->offset*3))]); }*/
+                                               //printf("%d\n", ((*i)+((ii)*3))/3);
+                                               //printf("ii=%d\n", ii);
+                                               //printf("aqpp=%d\n", aqpp);
+                                               //printf("                      %d\n", ((*i)+((aqpp-ii)*3))/3);
+                                       }
+                                       //printf("      %d\n",((((*i)+((aqpp-ii)*3)))-(bmp->offset*3)));
+                                       //printf("      %d\n",((((*i)+((aqpp-ii)*3))+1)-(bmp->offset*3)));
+                                       //printf("      %d\n",((((*i)+((aqpp-ii)*3))+2)-(bmp->offset*3)));
+                                       //printf("(*i)=%d\n", (*i));
+                               }
+                               //printf("[%d]", p[((*i)-q)]);  printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]);
                                w++;
                                break;
                        }
                        else
                        {
-                               /*if(qp>0)
-                               {
-                                       printf("        ((*i)-(bmp->offset*3))=%02d\n", ((*i)-(bmp->offset*3)));
-                               }*/
-                               /*if(q>0 && qp==0)
-                               {
-                                       printf("(*i)-q=%02d", (*i)-q);
-                                       printf("[%d]", p[((*i)-q)]);    printf("[%d]", p[((*i)-q)+1]);  printf("[%d]", p[((*i)-q)+2]);  printf("[%d]", p[((*i)-q)+3]);                  printf("[%d]", p[((*i)-q)+4]);                  printf("[%d]", p[((*i)-q)+5]);                  printf("        %d [%d]\n", (*i), p[((*i)-q)]);
-                               }*/
                                if(qp==0) outp(PAL_DATA_REG, p[(*i)-q]);
                                else outp(PAL_DATA_REG, p[((*i)-(bmp->offset*3))]);
-                               /*if(q>0 && qp==0)
-                               {
-                                       qq=(*i)-q;
-                                       chkcolor(bmp, &q, &a, &aa, &z);
-                                       if(a[(*i)-q]==0)
-                                       {
-                                               printf("%d      qqqq\n", qq);
-                                               outp(PAL_DATA_REG, p[(*i)-q]);
-                                       }
-                               }
-                               else
-                               {
-                                       outp(PAL_DATA_REG, p[(*i)-q]);
-                               }*/
                        }
                }
        }
 
-//     if(qp>0) printf("(*i)=%02d\n", (*i));
-
        //palette checker~
-       if(q>0 && qp==0/* && qr==0*/)
+       if(q>0 && qp==0)
        {
-               word qw=0;
                long lq;
                long bufSize = (bmp->width * bmp->height);
                chkcolor(bmp, &q, &a, &aa, &z);
 
-               printf("z=%d\n", z/3);
+               /*printf("z=%d\n", z/3);
                printf("q+z=%d\n", (q+z)/3);
                printf("z-ppee=%d\n", (z-ppee)/3);
-//             printf("%d\n", (z-(z-ppee))/3);
                printf("q=%d\n", q/3);
-               printf("aa=%d\n", aa);
+               printf("aa=%d\n", aa);*/
 
-               aq=0; pp = q; ppee=q;//(aq)*3;
+               aq=0; pp = q; ppee=q;
 aqpee:
-               while(aq<aa)
+               while(aq<=aa)
                {
                        //printf("a[%02d]=(%d)", aq, a[aq]);
                        if(a[aq]==0) aq++;
-                       else break;
+                       else{ aqpp++; break; }
                }
 
-//             spee=0;
-
-               aqpp=(aq*3);
-               //aqpp=q*2;
-
-//                     printf("\naq=%02d\n", aq);
-//                     printf("spee=%02d\n\n", spee);
-                       //printf("aqpp=%02d\n\n", aqpp/3);
+/*             printf("aq=%02d\n", aq);
+               printf("z=%02d\n", z/3);
+               printf("(z/3)-aqpp=%02d\n", (z/3)-aqpp);
+               printf("aqpp=%02d\n", aqpp);*/
 
        for(lq=0; lq<bufSize; lq++)
        {
                if(bmp->data[lq]+bmp->offset==aq)
                {
-                       //printf("%02d", bmp->data[lq]);
+                       //printf("\n%02d\n", bmp->data[lq]);
                        //printf("\n%02d\n", bmp->offset);
-                       //printf("%02d\n", a[aq]);
-                       bmp->data[lq]=((bmp->data[lq]+bmp->offset)-a[aq]);
+                       //printf("\naq= %02d\n", aq);
+                       //printf("a[aq]=        %02d\n", a[aq]);
+                       //bmp->data[lq]=((bmp->data[lq]+bmp->offset)-a[aq]);
+                       bmp->data[lq]=a[aq];
+                       //printf("_%d \n", bmp->data[lq]);
+               }
+               else if(bmp->data[lq]+bmp->offset < (z/3)-aqpp)
+               {
+                       if(bmp->data[lq]+bmp->offset >= aq) bmp->data[lq]=(bmp->data[lq]+bmp->offset)-aqpp;
+                       else bmp->data[lq]+=(bmp->offset);
                }
-               else if(bmp->data[lq]+bmp->offset < z/3){ bmp->data[lq]+=bmp->offset; }
+
                //printf("%02d ", bmp->data[lq]);
                //if(lq > 0 && lq%bmp->width==0) printf("\n");
        }
 
-//     if(spee==0)
-//     {
-       while(pp<=aqpp)
+       while(pp<=(aq*3))
        {
-               //if(pp<(z-1))
-               /*printf("pp=%02d       ", pp/3);
-               printf("bmp: [%d]", bmp->palette[pp-ppee]);
-               printf("[%d]", bmp->palette[(pp-ppee)+1]);
-               printf("[%d]\n", bmp->palette[(pp-ppee)+2]);*/
                if(((pp/3)==aq || spee>0))
                {
-                       printf("spee=%d\n", spee);
+                       /*printf("spee=%d\n", spee);
                        printf("                pp=%02d ", pp/3);
                        printf("old     bmp: [%d]", bmp->palette[(pp-ppee)]);
                        printf("[%d]", bmp->palette[(pp-ppee)+1]);
-                       printf("[%d]\n", bmp->palette[(pp-ppee)+2]);
+                       printf("[%d]\n", bmp->palette[(pp-ppee)+2]);*/
                        //if(spee==0) printf("\npp=%02d\n\n", pp/3);
                        bmp->palette[(pp-ppee)]=                bmp->palette[(pp-ppee)+3];
                        bmp->palette[(pp-ppee)+1]=      bmp->palette[(pp-ppee)+4];
                        bmp->palette[(pp-ppee)+2]=      bmp->palette[(pp-ppee)+5];
                        if(spee==0) spee++;
                }
-/*             bmp->palette[pp]=               bmp->palette[pp+3];
-               bmp->palette[pp+1]=     bmp->palette[pp+4];
-               bmp->palette[pp+2]=     bmp->palette[pp+5];*/
-               printf("                pp=%02d ", pp/3);
+               /*printf("              pp=%02d ", pp/3);
                printf("        bmp: [%d]", bmp->palette[(pp-ppee)]);
                printf("[%d]", bmp->palette[(pp-ppee)+1]);
-               printf("[%d]\n", bmp->palette[(pp-ppee)+2]);
-/*             printf("bmp: [%d]", bmp->palette[pp]);
-               printf("[%d]", bmp->palette[pp+1]);
-               printf("[%d]\n", bmp->palette[pp+2]);*/
-               //aqpp=(pp-ppee);
-               //else if(pp==(z-1)) bmp->palette[pp]=0;
-               //if(pp<aqpp-3) 
+               printf("[%d]\n", bmp->palette[(pp-ppee)+2]);*/
                pp+=3;
        }
-//     spee++;
-       //ppp=aqpp-ppee;
-       //printf("aqpp= %02d\n", aqpp/3);
-       //printf("pp=   %02d\n", pp/3);
-       //printf("ppp=  %02d\n", ppp/3);
-       //printf("&aqpp=        %02d\n", &aqpp);
-       //printf("q=    %02d\n", q/3);
-       //printf("z=    %02d\n", z/3);
-       //printf("&q=   %02d\n", &q);
-       //modexPalUpdate(bmp, &q, 1);
-       //modexPalUpdate(bmp, &, 1);
-//     if(pp<=aqpp) 
-       //modexPalUpdate(bmp, &ppp, 1);
-       modexPalUpdate(bmp, &aqpp, 1, aqpp);
+
+       //update the palette~
+       //printf("      aqpp=           %d\n", aqpp);
+       modexPalUpdate(bmp, &ppee, 1, aqpp);
+       (*i)=ppee;
+       //printf("      aqpp=   %d\n", aqpp);
+       //printf("      ppee=   %d\n", ppee);
+
+       /*printf(".\n");
        printf("aqpp=   %02d\n", aqpp/3);
        printf("aq=     %02d\n", aq);
        printf("aa=     %02d\n", aa);
-//     }
+       printf("                ppee=   %02d\n", ppee);*/
 
-//     modexPalUpdate(bmp, 0, 1);
-
-       if(aq<aa){ printf("~~~~\n");  /*ppp=q; spee=0;*/ aq++; goto aqpee; }
+       if(aq<aa){ /*printf("~~~~\n"); */ppee=q; aq++; goto aqpee; }
+       /*printf("ppee=%d\n", ppee);
+       printf("pp=%d\n", pp);
+       printf("q=%d\n", q);
+       printf("(*i)=%d\n", (*i));*/
 
        }
 }
@@ -842,14 +827,16 @@ modexPalUpdate2(byte *p)
        }
 }
 
+//color checker~
+//i want to make another vesion that checks the palette when the palette is being appened~
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z)
 {
                byte *pal;
                word zz=0;
                pal = modexNewPal();
                modexPalSave(pal);
-               //q-=3;
                //printf("q: %02d\n", (*q));
+
                //check palette for dups
                for((*z)=0; (*z)<PAL_SIZE; (*z)+=3)
                {

diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index 0a6b5c46be5d87f56103e60eeef2a81c54bc566c..6cef33cd1f19567e8041ff4c57c4c483125f2f1b 100644 (file)
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -55,7 +55,7 @@ void modexPalBlack();
 void modexPalWhite();
 
 /* utility functions */
-void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word qr);
+void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqpp);
 void modexPalUpdate2(byte *p);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z);
 void modexWaitBorder();

diff --git a/src/scroll.c b/src/scroll.c
index 2a7eb3fd03dbddfc06956c8802617e46dd423d4d..5cea58ed9e5773d1ee9ff2fdc3bdac58d5128ecc 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -177,7 +177,6 @@ void main() {
        setkb(1);
        modexEnter();
        modexPalBlack();
-       //ptmp.offset=(paloffset/3);
        ptmp.offset=(paloffset/3);
        modexPalUpdate(&ptmp, &paloffset, 0, 0);
        //printf("      %d\n", sizeof(ptmp.data));
@@ -572,7 +571,7 @@ void main() {
        printf("player.hp: %d\n", player.hp);\r
        printf("player.q: %d\n", player.q);\r
        printf("player.d: %d\n", player.d);
-       printf("palette offset: %d\n", paloffset);
+       printf("palette offset: %d\n", paloffset/3);
        printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
        printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
        printf("\n");\r
@@ -804,11 +803,26 @@ mapGoTo(map_view_t *mv, int tx, int ty) {
 void\r
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {\r
        word rx;\r
-       word ry;\r
-       rx = (i % t->cols) * t->tileWidth;\r
-       ry = (i / t->cols) * t->tileHeight;\r
+       word ry;
+       //rx = (i % t->cols) * t->tileWidth;\r
+       //ry = (i / t->cols) * t->tileHeight;
+       //if(i==0) i=2;
+       if(i==0)
+       {
+               //wwww
+       }
+       else
+       {
+       rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);\r
+       ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
+       if(i==5) printf("rx=    %d\n", rx);
+       if(i==5) printf("ry=    %d\n", ry);
+       if(i==5) printf("i=     %d\n", i);
+       //if(i==4) printf("x=   %d\n", (i % ((t->data->width*i)/t->tileWidth)) * t->tileWidth);
+       //if(i==4) printf("y=   %d\n", (i / ((t->data->height*i)/t->tileHeight)) * t->tileHeight);\r
        //mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);\r
-       modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
+       modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+       }\r
 }\r
 \r
 \r
@@ -821,7 +835,10 @@ mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
        i=ty * mv->map->width + tx;\r
        for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
        if(i>=0) {\r
-               /* we are in the map, so copy! */\r
+               /* we are in the map, so copy! */
+               //if(mv->map->data[i]==0) mv->map->data[i]=2;
+               //if(mv->map->data[i]==0) modexClearRegion(mv->page, x, y, 16, 16, 0);
+               //else
                mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
        }\r
        i++; /* next! */\r
@@ -840,7 +857,10 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
           i + 1 row above and one below */\r
        for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {\r
        if(i>=0) {\r
-               /* we are in the map, so copy away! */\r
+               /* we are in the map, so copy away! */
+               //if(mv->map->data[i]==0) mv->map->data[i]=2;
+               //if(mv->map->data[i]==0) modexClearRegion(mv->page, x, y, 16, 16, 0);
+               //else\r
                mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
        }\r
        i += mv->map->width;\r

diff --git a/test.exe b/test.exe
index 73b8e85ecee531e5df0108580412136e27424487..9b8d7711af87f004fb284e274429720b19354f4c 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 8e3efeb67e48aca1a78cef80f6601c4064905e9b..877d338da79d33df1f709be8df2c5cce5ba88d5b 100644 (file)
Binary files a/test2.exe and b/test2.exe differ