marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Win32 compile fixes

Sven Eberhardt 2010-12-12 13:53:51 +01:00
parent 8210b6443e
commit 1b4b801fec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/editor/C4ToolsDlg.h
View File

@ -87,12 +87,12 @@ protected:
void InitGradeCtrl();
void InitMaterialCtrls();
void UpdateToolCtrls();
void SetTexture(const char *szTexture);
void SetMaterial(const char *szMaterial);
void UpdateTextures();
void SetColorPattern(const char *szMaterial, const char *szTexture);
public:
void UpdateLandscapeModeCtrls();
void SetTexture(const char *szTexture);
void SetMaterial(const char *szMaterial);
};
#endif //INC_C4ToolsDlg

2
src/gui/C4Viewport.cpp
View File

@ -624,7 +624,7 @@ bool C4Viewport::Init(CStdWindow * pParent, CStdApp * pApp, int32_t iPlayer)
fIsNoOwnerViewport = (Player == NO_OWNER);
// Create window
pWindow = new C4ViewportWindow(this);
if (!pWindow->Init(pApp, (Player==NO_OWNER) ? LoadResStr("IDS_CNS_VIEWPORT") : ::Players.Get(Player)->GetName(), pParent, false))
if (!pWindow->Init(CStdWindow::W_Viewport, pApp, (Player==NO_OWNER) ? LoadResStr("IDS_CNS_VIEWPORT") : ::Players.Get(Player)->GetName(), pParent, false))
return false;
pWindow->pSurface = new CSurface(pApp, pWindow);
// Position and size