summaryrefslogtreecommitdiff
path: root/library/modules
diff options
context:
space:
mode:
authorTimothy Collett2012-05-24 15:39:11 -0400
committerTimothy Collett2012-05-24 15:39:11 -0400
commit44c3afc3066652f39d0b7be56cdca1f88e155132 (patch)
treeb2b7c1d778527f3b2a99f8c5301170c86e636009 /library/modules
parent7e88631698077ef88dced138126dd9f36acc6388 (diff)
parentae41ddc04a2b3a076bd18af984f163e46c74b65f (diff)
downloaddfhack-44c3afc3066652f39d0b7be56cdca1f88e155132.tar.gz
dfhack-44c3afc3066652f39d0b7be56cdca1f88e155132.tar.bz2
dfhack-44c3afc3066652f39d0b7be56cdca1f88e155132.tar.xz
Merge git://github.com/quietust/dfhack
Gotta get the changes that prevent DFHack from crashing.
Diffstat (limited to 'library/modules')
-rw-r--r--library/modules/Gui.cpp23
-rw-r--r--library/modules/Windows.cpp6
-rw-r--r--library/modules/World.cpp45
3 files changed, 35 insertions, 39 deletions
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 27ac3ddd..e1810522 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -998,16 +998,29 @@ bool Gui::setDesignationCoords (const int32_t x, const int32_t y, const int32_t
bool Gui::getMousePos (int32_t & x, int32_t & y)
{
- x = gps->mouse_x;
- y = gps->mouse_y;
+ if (gps) {
+ x = gps->mouse_x;
+ y = gps->mouse_y;
+ }
+ else {
+ x = -1;
+ y = -1;
+ }
return (x == -1) ? false : true;
}
bool Gui::getWindowSize (int32_t &width, int32_t &height)
{
- width = gps->dimx;
- height = gps->dimy;
- return true;
+ if (gps) {
+ width = gps->dimx;
+ height = gps->dimy;
+ return true;
+ }
+ else {
+ width = 80;
+ height = 25;
+ return false;
+ }
}
bool Gui::getMenuWidth(uint8_t &menu_width, uint8_t &area_map_width)
diff --git a/library/modules/Windows.cpp b/library/modules/Windows.cpp
index e069d964..218b6f7e 100644
--- a/library/modules/Windows.cpp
+++ b/library/modules/Windows.cpp
@@ -34,10 +34,12 @@ distribution.
#include "modules/Windows.h"
using namespace DFHack;
+using df::global::gps;
Windows::df_screentile *Windows::getScreenBuffer()
{
- return (df_screentile *) df::global::gps->screen;
+ if (!gps) return NULL;
+ return (df_screentile *) gps->screen;
}
Windows::df_window::df_window(int x, int y, unsigned int width, unsigned int height)
@@ -79,7 +81,7 @@ bool Windows::df_window::unlock (painter * painter)
return false;
}
-Windows::top_level_window::top_level_window(): df_window(0,0,df::global::gps->dimx,df::global::gps->dimy)
+Windows::top_level_window::top_level_window() : df_window(0,0,gps ? gps->dimx : 80,gps ? gps->dimy : 25)
{
buffer = 0;
}
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index 6f6a69a5..4b50b44c 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -63,15 +63,8 @@ struct World::Private
bool Inited;
bool PauseInited;
- void * pause_state_offset;
-
bool StartedWeather;
- char * weather_offset;
-
bool StartedMode;
- void * gamemode_offset;
- void * controlmode_offset;
- void * controlmodecopy_offset;
int next_persistent_id;
std::multimap<std::string, int> persistent_index;
@@ -86,21 +79,14 @@ World::World()
Core & c = Core::getInstance();
d = new Private;
d->owner = c.p;
- wmap = 0;
- d->pause_state_offset = (void *) c.vinfo->getAddress ("pause_state");
- if(d->pause_state_offset)
+ if(df::global::pause_state)
d->PauseInited = true;
- d->weather_offset = (char *) c.vinfo->getAddress( "current_weather" );
- if(d->weather_offset)
- {
- wmap = (weather_map *) d->weather_offset;
+ if(df::global::current_weather)
d->StartedWeather = true;
- }
- d->gamemode_offset = (void *) c.vinfo->getAddress( "game_mode" );
- d->controlmode_offset = (void *) c.vinfo->getAddress( "control_mode" );
- d->StartedMode = true;
+ if (df::global::game_mode && df::global::control_mode)
+ d->StartedMode = true;
d->Inited = true;
}
@@ -123,14 +109,13 @@ bool World::Finish()
bool World::ReadPauseState()
{
if(!d->PauseInited) return false;
- uint8_t pauseState = d->owner->readByte (d->pause_state_offset);
- return pauseState & 1;
+ return *df::global::pause_state;
}
void World::SetPauseState(bool paused)
{
- if(!d->PauseInited) return;
- d->owner->writeByte (d->pause_state_offset, paused);
+ if (d->PauseInited)
+ *df::global::pause_state = paused;
}
uint32_t World::ReadCurrentYear()
@@ -147,8 +132,8 @@ bool World::ReadGameMode(t_gamemodes& rd)
{
if(d->Inited && d->StartedMode)
{
- rd.g_mode = (GameMode) d->owner->readDWord( d->controlmode_offset);
- rd.g_type = (GameType) d->owner->readDWord(d->gamemode_offset);
+ rd.g_mode = (DFHack::GameMode)*df::global::control_mode;
+ rd.g_type = (DFHack::GameType)*df::global::game_mode;
return true;
}
return false;
@@ -157,8 +142,8 @@ bool World::WriteGameMode(const t_gamemodes & wr)
{
if(d->Inited && d->StartedMode)
{
- d->owner->writeDWord(d->gamemode_offset,wr.g_type);
- d->owner->writeDWord(d->controlmode_offset,wr.g_mode);
+ *df::global::control_mode = wr.g_mode;
+ *df::global::game_mode = wr.g_type;
return true;
}
return false;
@@ -199,18 +184,14 @@ uint32_t World::ReadCurrentDay()
uint8_t World::ReadCurrentWeather()
{
if (d->Inited && d->StartedWeather)
- return(d->owner->readByte(d->weather_offset + 12));
+ return (*df::global::current_weather)[2][2];
return 0;
}
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);
- }
+ memset(df::global::current_weather, weather, 25);
}
string World::ReadWorldFolder()