q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes II

Browse Source
This commit is contained in:
zcaliptium 2016-03-23 20:42:20 +03:00
parent ef0b970490
commit 1c5556dbd9
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/GameMP/Computer.cpp
View File

@ -851,7 +851,7 @@ static void ComputerOn(void)
_ppenPlayer->GetStats(_strStatsDetails, CST_DETAIL, _ctTextCharsPerRow); _ppenPlayer->GetStats(_strStatsDetails, CST_DETAIL, _ctTextCharsPerRow);
// if end of level // if end of level
if (_ppenPlayer!=NULL && _ppenPlayer->m_bEndOfLevel || _pNetwork->IsGameFinished()) { if (_ppenPlayer->m_bEndOfLevel || _pNetwork->IsGameFinished()) {
// select statistics // select statistics
_cmtWantedType = CMT_STATISTICS; _cmtWantedType = CMT_STATISTICS;
// if not end of level // if not end of level

7
Sources/LWSkaExporter/ModelerMeshExporter.cpp
View File

@ -413,13 +413,13 @@ void ExportMesh_modeler(int iFaceForward) {
char fnmOut[256]; char fnmOut[256];
char *strFileName; char *strFileName;
_state = _meshEditOperations->state;
if (_meshEditOperations == NULL) { if (_meshEditOperations == NULL) {
_msg->error("Error!","Error _meshEditOperations is NULL!"); _msg->error("Error!", "Error _meshEditOperations is NULL!");
return; return;
} }
_state = _meshEditOperations->state;
_ctPntIDs = _meshEditOperations->pointCount(_state,OPLYR_FG,EDCOUNT_ALL); _ctPntIDs = _meshEditOperations->pointCount(_state,OPLYR_FG,EDCOUNT_ALL);
_ctPolIDs = _meshEditOperations->polyCount(_state,OPLYR_FG,EDCOUNT_ALL); _ctPolIDs = _meshEditOperations->polyCount(_state,OPLYR_FG,EDCOUNT_ALL);
@ -438,6 +438,7 @@ void ExportMesh_modeler(int iFaceForward) {
_fpOutput = fopen(fnmOut, "w"); _fpOutput = fopen(fnmOut, "w");
if (_fpOutput==NULL) { if (_fpOutput==NULL) {
msgbox_modeler(_xpanf, "Can't open file!"); msgbox_modeler(_xpanf, "Can't open file!");
return;
} }
// write the mesh header // write the mesh header

2
Sources/WorldEditor/ToolTipWnd.cpp
View File

@ -135,8 +135,8 @@ void CToolTipWnd::OnPaint()
dc.SetTextColor( colInk); dc.SetTextColor( colInk);
CDC *pDC = GetDC(); CDC *pDC = GetDC();
if (pDC == NULL) return;
pDC->SelectObject( &theApp.m_FixedFont); pDC->SelectObject( &theApp.m_FixedFont);
if( pDC == NULL) return;
INDEX ctLines = GetLinesCount(); INDEX ctLines = GetLinesCount();
for(INDEX iLine = 0; iLine<ctLines; iLine++) for(INDEX iLine = 0; iLine<ctLines; iLine++)

5
Sources/WorldEditor/WorldEditorView.cpp
View File

@ -9030,9 +9030,10 @@ void CWorldEditorView::OnPreviousMipBrush()
{ {
CMainFrame* pMainFrame = STATIC_DOWNCAST(CMainFrame, AfxGetMainWnd()); CMainFrame* pMainFrame = STATIC_DOWNCAST(CMainFrame, AfxGetMainWnd());
CEntity *penBrush = pMainFrame->m_CSGDesitnationCombo.GetSelectedBrushEntity(); CEntity *penBrush = pMainFrame->m_CSGDesitnationCombo.GetSelectedBrushEntity();
CBrush3D &brBrush = *penBrush->en_pbrBrush;
if (penBrush==NULL) return; if (penBrush == NULL) return;
CBrush3D &brBrush = *penBrush->en_pbrBrush;
// remember current time as time when last mip brushing option has been used // remember current time as time when last mip brushing option has been used
_fLastMipBrushingOptionUsed = _pTimer->GetRealTimeTick(); _fLastMipBrushingOptionUsed = _pTimer->GetRealTimeTick();