paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

ScEd updated for new terrain stuff, window styles for pyrogenesis in windowed mode changed to give a bordered movable window.

Browse Source 
This was SVN commit r2583.
This commit is contained in:
Simon Brenner 2005-08-08 03:59:50 +00:00
parent 43baf6ada6
commit 630b375f4d
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/sysdep/win/wsdl.cpp
View File

@ -660,7 +660,9 @@ keep:
return 0;
}
hWnd = CreateWindowEx(0, (LPCSTR)class_atom, APP_NAME, WS_POPUP|WS_VISIBLE, 0, 0, w, h, 0, 0, hInst, 0);
DWORD windowStyle = fullscreen ? (WS_POPUP|WS_VISIBLE) : (WS_CAPTION | WS_POPUPWINDOW | WS_VISIBLE);
hWnd = CreateWindowEx(0, (LPCSTR)class_atom, APP_NAME, windowStyle, 0, 0, w, h, 0, 0, hInst, 0);
if(!hWnd)
return 0;

2
source/main.cpp
View File

@ -1546,8 +1546,6 @@ void ScEd_Init()
void ScEd_Shutdown()
{
Shutdown();
delete &g_Profiler;
}
#endif // SCED

1
source/tools/sced/EditorData.cpp
View File

@ -26,6 +26,7 @@
#include "XML.h"
#include "Game.h"
#include "GameAttributes.h"
const int NUM_ALPHA_MAPS = 14;
Handle AlphaMaps[NUM_ALPHA_MAPS];

8
source/tools/sced/ui/TexToolsDlgBar.cpp
View File

@ -95,12 +95,12 @@ static void ConvertColor(const Color8888* src,Color888* dst)
dst->b=src->b;
}
CTerrainTypeGroup *CTexToolsDlgBar::GetCurrentTerrainType()
CTerrainGroup *CTexToolsDlgBar::GetCurrentTerrainType()
{
CComboBox* terraintypes=(CComboBox*) GetDlgItem(IDC_COMBO_TERRAINTYPES);
int nIndex=terraintypes->GetCurSel();
if (nIndex != CB_ERR)
return (CTerrainTypeGroup *)terraintypes->GetItemDataPtr(nIndex);
return (CTerrainGroup *)terraintypes->GetItemDataPtr(nIndex);
else
return NULL;
}
@ -200,8 +200,8 @@ BOOL CTexToolsDlgBar::OnInitDialog()
// build combo box for terrain types
CComboBox* terraintypes=(CComboBox*) GetDlgItem(IDC_COMBO_TERRAINTYPES);
const CTextureManager::TerrainTypeGroupMap &ttypes=g_TexMan.GetGroups();
CTextureManager::TerrainTypeGroupMap::const_iterator it;
const CTextureManager::TerrainGroupMap &ttypes=g_TexMan.GetGroups();
CTextureManager::TerrainGroupMap::const_iterator it;
for (it=ttypes.begin();it!=ttypes.end();++it) {
int nIndex=terraintypes->AddString(it->second->GetName().c_str());
if (nIndex != CB_ERR)

2
source/tools/sced/ui/TexToolsDlgBar.h
View File

@ -17,7 +17,7 @@ public:
protected:
CImageList m_ImageList;
CTerrainTypeGroup *GetCurrentTerrainType();
CTerrainGroup *GetCurrentTerrainType();
void Select(CTextureEntry* entry);
BOOL BuildImageListIcon(CTextureEntry* texentry);