From 35a58cdf0c6f47dad60ef5b27420ab60f81774cd Mon Sep 17 00:00:00 2001
From: Mikko Juola <mikko.juola@kolumbus.fi>
Date: Mon, 16 Aug 2010 14:50:12 +0300
Subject: [PATCH] Add screen_tiles_pointer for Memory.xml and fix reading
 screen tiles in Position module.

---
 data/Memory.xml              |  1 +
 library/modules/Position.cpp | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/Memory.xml b/data/Memory.xml
index fd0072623..3b50deb28 100644
--- a/data/Memory.xml
+++ b/data/Memory.xml
@@ -1721,6 +1721,7 @@ map_data_1b60_offset          0x1B9c
     <Entry version="v0.31.12" os="windows" id="0.31.12" base="0.31.11">
         <String name="md5">f0459165a426a9f2dd8d957e9fa7f01d</String>
         <HexValue name="pe_timestamp">0x4C4C32E7</HexValue>
+        <Address name="screen_tiles_pointer">0x18313D0</Address>
     </Entry>
                             .-"""-.
                            '       \
diff --git a/library/modules/Position.cpp b/library/modules/Position.cpp
index ab3fccba3..694db6838 100644
--- a/library/modules/Position.cpp
+++ b/library/modules/Position.cpp
@@ -177,7 +177,7 @@ bool Position::getScreenTiles (int32_t width, int32_t height, t_screen screen[])
     if(!d->StartedScreen) return false;
 
     uint32_t screen_addr;
-    d->owner->read (d->screen_tiles_ptr_offset, sizeof(uint32_t), (uint8_t *) screen_addr);
+    d->owner->read (d->screen_tiles_ptr_offset, sizeof(uint32_t), (uint8_t *) &screen_addr);
 
     uint8_t* tiles = new uint8_t[width*height*4/* + 80 + width*height*4*/];
 
@@ -187,10 +187,10 @@ bool Position::getScreenTiles (int32_t width, int32_t height, t_screen screen[])
     {
         for(int32_t ix=0; ix<width; ix++)
         {
-            screen[ix + iy*width].symbol = tiles[iy + ix*height*4 +0];
-            screen[ix + iy*width].foreground = tiles[iy + ix*height*4 +1];
-            screen[ix + iy*width].background = tiles[iy + ix*height*4 +2];
-            screen[ix + iy*width].bright = tiles[iy + ix*height*4 +3];
+            screen[ix + iy*width].symbol = tiles[(iy + ix*height)*4 +0];
+            screen[ix + iy*width].foreground = tiles[(iy + ix*height)*4 +1];
+            screen[ix + iy*width].background = tiles[(iy + ix*height)*4 +2];
+            screen[ix + iy*width].bright = tiles[(iy + ix*height)*4 +3];
             //screen[ix + iy*width].gtile = tiles[width*height*4 + 80 + iy + ix*height +0];
             //screen[ix + iy*width].grayscale = tiles[width*height*4 + 80 + iy + ix*height +1];
         }