Grmf

1 files changed, 14 insertions, 2 deletions

diff --git a/ffx-convert.cpp b/ffx-convert.cpp
index 0fa6818..45bc314 100644
--- a/ffx-convert.cpp
+++ b/ffx-convert.cpp
@@ -18,6 +18,8 @@ Color LookUp(char i) {
 }
 
 int transform(int x, int y) {
+
+/*
     int numero_bloc_x = x / BLOC_SX;
     int numero_bloc_y = y / BLOC_SY;
     
@@ -26,7 +28,11 @@ int transform(int x, int y) {
     int bx = x % BLOC_SX;
     int by = y % BLOC_SY;
     
-    return numero_bloc * BLOC_SX * BLOC_SY + by * BLOC_SX + bx;    
+    return numero_bloc * BLOC_SX * BLOC_SY + by * BLOC_SX + bx;
+*/
+
+    return y * IMG_SX + x;
+
 }
 
 virtual int startup() throw (GeneralException) {
@@ -54,13 +60,19 @@ virtual int startup() throw (GeneralException) {
     char buffer[65536];
     
     Byte b;
-    
+
+/*    
     for (int i = 0; i < 32768; i++) {
 	int j = i << 1;
 	map->read(&b, 1);
 	buffer[j] = b & 0x0f;
 	buffer[j + 1] = (b & 0xf0) >> 4;
     }
+*/
+    for (int i = 0; i < 65536; i++) {
+	map->read(&b, 1);
+	buffer[i] = b;
+    }
     
     img->Fill();