git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1171 993157c7-ee19-0410-b2c4-bb4e9862e678

This commit is contained in:
chrisf
2007-07-11 11:37:50 +00:00
parent 3c8eba7c74
commit 8411c5cd8e
2 changed files with 3 additions and 3 deletions

View File

@@ -29,7 +29,7 @@ namespace BluntDirectX { namespace Direct3D
void * ib; void * ib;
buffer->Lock( 0, sizeof(unsigned short) * size, &ib, D3DLOCK_DISCARD ); buffer->Lock( 0, sizeof(unsigned short) * size, &ib, D3DLOCK_DISCARD );
memcpy( ib, pdata, sizeof(unsigned short) * size ); memcpy( ib, pdata, sizeof(unsigned short) * data.Length );
buffer->Unlock(); buffer->Unlock();
} }

View File

@@ -21,7 +21,7 @@ namespace OpenRa.Game
Package TileMix; Package TileMix;
string TileSuffix; string TileSuffix;
const string mapName = "scm12ea.ini"; const string mapName = "scg11eb.ini";
Dictionary<TileReference, SheetRectangle<Sheet>> tileMapping = Dictionary<TileReference, SheetRectangle<Sheet>> tileMapping =
new Dictionary<TileReference, SheetRectangle<Sheet>>(); new Dictionary<TileReference, SheetRectangle<Sheet>>();
@@ -106,7 +106,7 @@ namespace OpenRa.Game
public MainWindow() public MainWindow()
{ {
renderer = new Renderer(this, new Size(1280, 800), false); renderer = new Renderer(this, new Size(1280,800), false);
Visible = true; Visible = true;
IniFile mapFile = new IniFile(File.OpenRead("../../../" + mapName)); IniFile mapFile = new IniFile(File.OpenRead("../../../" + mapName));