Cleanup World module to use df::global, and fix crashes when control_mode/game_mode are missing

develop
Quietust 2012-05-23 12:51:03 -05:00
parent 20794ebf19
commit 9a73ea9f14
3 changed files with 25 additions and 52 deletions

@ -37,16 +37,6 @@ distribution.
namespace DFHack namespace DFHack
{ {
/**
* \ingroup grp_world
*/
enum WeatherType
{
CLEAR,
RAINING,
SNOWING
};
typedef unsigned char weather_map [5][5];
/** /**
* \ingroup grp_world * \ingroup grp_world
*/ */
@ -113,7 +103,6 @@ namespace DFHack
class DFHACK_EXPORT World : public Module class DFHACK_EXPORT World : public Module
{ {
public: public:
weather_map * wmap;
World(); World();
~World(); ~World();
bool Start(); bool Start();

@ -63,15 +63,8 @@ struct World::Private
bool Inited; bool Inited;
bool PauseInited; bool PauseInited;
void * pause_state_offset;
bool StartedWeather; bool StartedWeather;
char * weather_offset;
bool StartedMode; bool StartedMode;
void * gamemode_offset;
void * controlmode_offset;
void * controlmodecopy_offset;
int next_persistent_id; int next_persistent_id;
std::multimap<std::string, int> persistent_index; std::multimap<std::string, int> persistent_index;
@ -86,20 +79,13 @@ World::World()
Core & c = Core::getInstance(); Core & c = Core::getInstance();
d = new Private; d = new Private;
d->owner = c.p; d->owner = c.p;
wmap = 0;
d->pause_state_offset = (void *) c.vinfo->getAddress ("pause_state"); if(df::global::pause_state)
if(d->pause_state_offset)
d->PauseInited = true; d->PauseInited = true;
d->weather_offset = (char *) c.vinfo->getAddress( "current_weather" ); if(df::global::current_weather)
if(d->weather_offset)
{
wmap = (weather_map *) d->weather_offset;
d->StartedWeather = true; d->StartedWeather = true;
} if (df::global::game_mode && df::global::control_mode)
d->gamemode_offset = (void *) c.vinfo->getAddress( "game_mode" );
d->controlmode_offset = (void *) c.vinfo->getAddress( "control_mode" );
d->StartedMode = true; d->StartedMode = true;
d->Inited = true; d->Inited = true;
@ -123,14 +109,13 @@ bool World::Finish()
bool World::ReadPauseState() bool World::ReadPauseState()
{ {
if(!d->PauseInited) return false; if(!d->PauseInited) return false;
uint8_t pauseState = d->owner->readByte (d->pause_state_offset); return *df::global::pause_state;
return pauseState & 1;
} }
void World::SetPauseState(bool paused) void World::SetPauseState(bool paused)
{ {
if(!d->PauseInited) return; if (d->PauseInited)
d->owner->writeByte (d->pause_state_offset, paused); *df::global::pause_state = paused;
} }
uint32_t World::ReadCurrentYear() uint32_t World::ReadCurrentYear()
@ -147,8 +132,8 @@ bool World::ReadGameMode(t_gamemodes& rd)
{ {
if(d->Inited && d->StartedMode) if(d->Inited && d->StartedMode)
{ {
rd.g_mode = (GameMode) d->owner->readDWord( d->controlmode_offset); rd.g_mode = (DFHack::GameMode)*df::global::control_mode;
rd.g_type = (GameType) d->owner->readDWord(d->gamemode_offset); rd.g_type = (DFHack::GameType)*df::global::game_mode;
return true; return true;
} }
return false; return false;
@ -157,8 +142,8 @@ bool World::WriteGameMode(const t_gamemodes & wr)
{ {
if(d->Inited && d->StartedMode) if(d->Inited && d->StartedMode)
{ {
d->owner->writeDWord(d->gamemode_offset,wr.g_type); *df::global::control_mode = wr.g_mode;
d->owner->writeDWord(d->controlmode_offset,wr.g_mode); *df::global::game_mode = wr.g_type;
return true; return true;
} }
return false; return false;
@ -199,18 +184,14 @@ uint32_t World::ReadCurrentDay()
uint8_t World::ReadCurrentWeather() uint8_t World::ReadCurrentWeather()
{ {
if (d->Inited && d->StartedWeather) if (d->Inited && d->StartedWeather)
return(d->owner->readByte(d->weather_offset + 12)); return (*df::global::current_weather)[2][2];
return 0; return 0;
} }
void World::SetCurrentWeather(uint8_t weather) void World::SetCurrentWeather(uint8_t weather)
{ {
if (d->Inited && d->StartedWeather) if (d->Inited && d->StartedWeather)
{ memset(df::global::current_weather, weather, 25);
uint8_t buf[25];
memset(&buf,weather, sizeof(buf));
d->owner->write(d->weather_offset,sizeof(buf),buf);
}
} }
string World::ReadWorldFolder() string World::ReadWorldFolder()

@ -5,10 +5,13 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "modules/World.h" #include "modules/World.h"
#include "DataDefs.h"
#include "df/weather_type.h"
using std::vector; using std::vector;
using std::string; using std::string;
using namespace DFHack; using namespace DFHack;
using namespace df::enums;
bool locked = false; bool locked = false;
unsigned char locked_data[25]; unsigned char locked_data[25];
@ -82,7 +85,7 @@ command_result weather (color_ostream &con, vector <string> & parameters)
CoreSuspender suspend; CoreSuspender suspend;
DFHack::World * w = Core::getInstance().getWorld(); DFHack::World * w = Core::getInstance().getWorld();
if(!w->wmap) if(!df::global::current_weather)
{ {
con << "Weather support seems broken :(" << std::endl; con << "Weather support seems broken :(" << std::endl;
return CR_FAILURE; return CR_FAILURE;
@ -95,19 +98,19 @@ command_result weather (color_ostream &con, vector <string> & parameters)
{ {
for(int x = 0; x<5;x++) for(int x = 0; x<5;x++)
{ {
switch((*w->wmap)[x][y]) switch((*df::global::current_weather)[x][y])
{ {
case CLEAR: case weather_type::None:
con << "C "; con << "C ";
break; break;
case RAINING: case weather_type::Rain:
con << "R "; con << "R ";
break; break;
case SNOWING: case weather_type::Snow:
con << "S "; con << "S ";
break; break;
default: default:
con << (int) (*w->wmap)[x][y] << " "; con << (int) (*df::global::current_weather)[x][y] << " ";
break; break;
} }
} }
@ -120,17 +123,17 @@ command_result weather (color_ostream &con, vector <string> & parameters)
if(rain) if(rain)
{ {
con << "Here comes the rain." << std::endl; con << "Here comes the rain." << std::endl;
w->SetCurrentWeather(RAINING); w->SetCurrentWeather(weather_type::Rain);
} }
if(snow) if(snow)
{ {
con << "Snow everywhere!" << std::endl; con << "Snow everywhere!" << std::endl;
w->SetCurrentWeather(SNOWING); w->SetCurrentWeather(weather_type::Snow);
} }
if(clear) if(clear)
{ {
con << "Suddenly, sunny weather!" << std::endl; con << "Suddenly, sunny weather!" << std::endl;
w->SetCurrentWeather(CLEAR); w->SetCurrentWeather(weather_type::None);
} }
if(val_override != -1) if(val_override != -1)
{ {