(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for

the newhouses grf specs, so all newhouses grfs will be playable in the game.

Many thanks to everyone who contributed code and ideas, and all the testers
who found things we missed.
This commit is contained in:
maedhros
2007-03-19 11:27:30 +00:00
parent 3d3d8d7c47
commit 209101391a
28 changed files with 3049 additions and 1269 deletions

View File

@@ -18,6 +18,7 @@
#include "vehicle_gui.h"
#include "variables.h"
#include "ai/ai.h"
#include "newgrf_house.h"
#include "date.h"
#include "cargotype.h"
@@ -132,6 +133,7 @@ void InitializeGame(int mode, uint size_x, uint size_y)
InitializeSigns();
InitializeStations();
InitializeIndustries();
InitializeBuildingCounts();
InitializeMainGui();
InitializeNameMgr();
@@ -578,6 +580,34 @@ static void Save_MAP6()
}
}
static void Load_MAP7()
{
uint size = MapSize();
uint i;
for (i = 0; i != size;) {
uint8 buf[4096];
uint j;
SlArray(buf, lengthof(buf), SLE_UINT8);
for (j = 0; j != lengthof(buf); j++) _me[i++].m7 = buf[j];
}
}
static void Save_MAP7()
{
uint size = MapSize();
uint i;
SlSetLength(size);
for (i = 0; i != size;) {
uint8 buf[4096];
uint j;
for (j = 0; j != lengthof(buf); j++) buf[j] = _me[i++].m7;
SlArray(buf, lengthof(buf), SLE_UINT8);
}
}
static void Save_CHTS()
{
@@ -614,6 +644,7 @@ extern const ChunkHandler _misc_chunk_handlers[] = {
{ 'M3HI', Save_MAP4, Load_MAP4, CH_RIFF },
{ 'MAP5', Save_MAP5, Load_MAP5, CH_RIFF },
{ 'MAPE', Save_MAP6, Load_MAP6, CH_RIFF },
{ 'MAP7', Save_MAP7, Load_MAP7, CH_RIFF },
{ 'NAME', Save_NAME, Load_NAME, CH_ARRAY},
{ 'DATE', SaveLoad_DATE, SaveLoad_DATE, CH_RIFF},