From 3592748a50c6951eab0cf440b1556379dd44c89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Thu, 16 Sep 2010 15:09:42 +0200
Subject: [PATCH] Bits and pieces

---
 data/Memory-ng.xml        | 31 ++++++++++++++++++++++++++++---
 library/modules/World.cpp | 14 ++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index 1db405dae..d34825c3e 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -885,7 +885,7 @@
             <Group name="World">
                 <Address name="current_tick" description="Current time of the year" />
                 <Address name="current_year" description="Current year" />
-                <Address name="current_weather" description="Single byte, 0=clear, 1=raining, 2=snowing" />
+                <Address name="current_weather" description="5x5 array of bytes for surrounding biomes. For each: 0=clear, 1=raining, 2=snowing." />
             </Group>
         </Offsets>
     </Base>
@@ -1454,7 +1454,32 @@
             </Group>
         </Offsets>
     </Version>
-
+    <Version name="v0.31.13 SDL" os="windows" base="v0.31.12 SDL">
+        <MD5 value="59f194b0b2103ca5df7601a01ce21280" />
+        <PETimeStamp value="0x4C90ADA8" />
+        <Offsets>
+            <Address name="WORLD" value="0x016425A0" />
+            0x01482874 - current race
+            <Group name="Position">
+                <Address name="cursor_xyz" value="0xac77f0" />
+                <Address name="window_x" value="0xe42c74" />
+                <Address name="window_y" value="0xe70d48" />
+                <Address name="window_z" value="0xe70d24" />
+                <Address name="screen_tiles_pointer" value="0x01480684" /><!-- BAD, not a pointer! -->
+                <Address name="window_dims" value="0xac807c" />
+            </Group>
+            <Group name="GUI">
+                <Address name="pause_state" value="0x147E971" />
+            </Group>
+            <Group name="World">
+                <Address name="current_weather" value="0x147F94E 0x14BCDEE" /><!-- bad, not 25 byte array! -->
+            </Group>
+            <Group name="Vegetation">
+                <Address name="vector" value="0x1656EF0" />
+            </Group>
+        </Offsets>
+    </Version>
+    31.13 WEATHER_START 0147E94E
                             .-"""-.
                            '       \
                           |,.  ,-.  |   _________________________
@@ -1804,7 +1829,7 @@
             <Group name="World">
                 <Address name="current_year" value="0x92e0da0" />
                 <Address name="current_tick" value="0x92e0dc0" />
-                <Address name="current_weather" value="0x92e0e02" invalid="true" />
+                <Address name="current_weather" value="0x092E0D84" />
             </Group>
         </Offsets>
     </Version>
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index 009b696ac..3e1a670de 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -133,12 +133,22 @@ uint32_t World::ReadCurrentDay()
 uint8_t World::ReadCurrentWeather()
 {
     if (d->Inited && d->StartedWeather)
-        return(d->owner->readByte(d->weather_offset));
+        return(d->owner->readByte(d->weather_offset + 12));
     return 0;
 }
-
+/*
 void World::SetCurrentWeather(uint8_t weather)
 {
     if (d->Inited && d->StartedWeather)
         d->owner->writeByte(d->weather_offset,weather);
 }
+*/
+void World::SetCurrentWeather(uint8_t weather)
+{
+    if (d->Inited && d->StartedWeather)
+    {
+        uint8_t buf[25];
+        memset(&buf,weather, sizeof(buf));
+        d->owner->write(d->weather_offset,sizeof(buf),buf);
+    }
+}