From 8411c5cd8ef55298d56ba51ffd7af2a19a8bfa0a Mon Sep 17 00:00:00 2001 From: chrisf Date: Wed, 11 Jul 2007 11:37:50 +0000 Subject: [PATCH] git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1171 993157c7-ee19-0410-b2c4-bb4e9862e678 --- BluntDx/VertexBuffer.h | 2 +- OpenRa.Game/MainWindow.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BluntDx/VertexBuffer.h b/BluntDx/VertexBuffer.h index 0359a5bb63..b3553987ce 100644 --- a/BluntDx/VertexBuffer.h +++ b/BluntDx/VertexBuffer.h @@ -29,7 +29,7 @@ namespace BluntDirectX { namespace Direct3D void * ib; 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(); } diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs index 7f1ee3fa96..7e0e68c537 100644 --- a/OpenRa.Game/MainWindow.cs +++ b/OpenRa.Game/MainWindow.cs @@ -21,7 +21,7 @@ namespace OpenRa.Game Package TileMix; string TileSuffix; - const string mapName = "scm12ea.ini"; + const string mapName = "scg11eb.ini"; Dictionary> tileMapping = new Dictionary>(); @@ -106,7 +106,7 @@ namespace OpenRa.Game public MainWindow() { - renderer = new Renderer(this, new Size(1280, 800), false); + renderer = new Renderer(this, new Size(1280,800), false); Visible = true; IniFile mapFile = new IniFile(File.OpenRead("../../../" + mapName));