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

Fixes

Browse Source
This commit is contained in:
zcaliptium 2016-03-22 21:03:12 +03:00
parent 2b742dbdbe
commit ef0b970490
8 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Engine/Entities/Entity.cpp
View File

@ -3534,7 +3534,7 @@ void CEntity::DumpSync_t(CTStream &strm, INDEX iExtensiveSyncCheck) // throw ch
(ULONG&)en_mRotation(3,1), (ULONG&)en_mRotation(3,2), (ULONG&)en_mRotation(3,3)); (ULONG&)en_mRotation(3,1), (ULONG&)en_mRotation(3,2), (ULONG&)en_mRotation(3,3));
if( en_pciCollisionInfo == NULL) { if( en_pciCollisionInfo == NULL) {
strm.FPrintF_t("Collision info NULL\n"); strm.FPrintF_t("Collision info NULL\n");
} else if (en_RenderType==RT_BRUSH && en_RenderType==RT_FIELDBRUSH) { } else if (en_RenderType==RT_BRUSH || en_RenderType==RT_FIELDBRUSH) {
strm.FPrintF_t("Collision info: Brush entity\n"); strm.FPrintF_t("Collision info: Brush entity\n");
} else { } else {
strm.FPrintF_t("Collision info:\n"); strm.FPrintF_t("Collision info:\n");

2
Sources/Engine/Graphics/Gfx_wrapper.h
View File

@ -177,7 +177,7 @@ public:
GfxWrap tp_eWrapU, tp_eWrapV; // wrapping states GfxWrap tp_eWrapU, tp_eWrapV; // wrapping states
inline CTexParams(void) { Clear(); tp_bSingleMipmap = FALSE; }; inline CTexParams(void) { Clear(); tp_bSingleMipmap = FALSE; };
inline void Clear(void) { tp_iFilter = 00; tp_iAnisotropy = 0; tp_eWrapU = tp_eWrapV = (GfxWrap)NONE; }; inline void Clear(void) { tp_iFilter = 00; tp_iAnisotropy = 0; tp_eWrapU = tp_eWrapV = (GfxWrap)NONE; };
inline BOOL IsEqual( CTexParams tp) { return tp_iFilter==tp.tp_iFilter && tp_iAnisotropy==tp_iAnisotropy && inline BOOL IsEqual( CTexParams tp) { return tp_iFilter==tp.tp_iFilter && tp_iAnisotropy==tp.tp_iAnisotropy &&
tp_eWrapU==tp.tp_eWrapU && tp_eWrapV==tp.tp_eWrapV; }; tp_eWrapU==tp.tp_eWrapU && tp_eWrapV==tp.tp_eWrapV; };
}; };

2
Sources/Engine/Network/SessionState.cpp
View File

@ -1188,7 +1188,7 @@ void CSessionState::ProcessGameStream(void)
} }
// if it is not avaliable yet // if it is not avaliable yet
} if (res==CNetworkStream::R_BLOCKNOTRECEIVEDYET) { } else if (res==CNetworkStream::R_BLOCKNOTRECEIVEDYET) {
// finish // finish
_pfNetworkProfile.StopTimer(CNetworkProfile::PTI_SESSIONSTATE_PROCESSGAMESTREAM); _pfNetworkProfile.StopTimer(CNetworkProfile::PTI_SESSIONSTATE_PROCESSGAMESTREAM);
return; return;

2
Sources/Engine/Terrain/Terrain.cpp
View File

@ -558,7 +558,7 @@ void CTerrain::SetShadowMapsSize(INDEX iShadowMapAspect, INDEX iShadingMapAspect
tr_iShadowMapSizeAspect = -(FastLog2(tr_pixHeightMapWidth-1)-5); tr_iShadowMapSizeAspect = -(FastLog2(tr_pixHeightMapWidth-1)-5);
} }
if(GetShadingMapWidth()<32 || GetShadingMapWidth()<32) { if(GetShadingMapWidth()<32 || GetShadingMapHeight()<32) {
tr_iShadingMapSizeAspect = 0; tr_iShadingMapSizeAspect = 0;
} }

2
Sources/SeriousSam/Menu.cpp
View File

@ -1185,7 +1185,7 @@ void JoinNetworkGame(void)
_pNetwork->ga_strRequiredMod.ScanF("%250[^\\]\\%s", &strModName, &strModURL); _pNetwork->ga_strRequiredMod.ScanF("%250[^\\]\\%s", &strModName, &strModURL);
_fnmModSelected = CTString(strModName); _fnmModSelected = CTString(strModName);
_strModURLSelected = strModURL; _strModURLSelected = strModURL;
if (_strModURLSelected="") { if (_strModURLSelected == "") {
_strModURLSelected = "http://www.croteam.com/mods/Old"; _strModURLSelected = "http://www.croteam.com/mods/Old";
} }
_strModServerSelected.PrintF("%s:%s", _pGame->gam_strJoinAddress, _pShell->GetValue("net_iPort")); _strModServerSelected.PrintF("%s:%s", _pGame->gam_strJoinAddress, _pShell->GetValue("net_iPort"));

4
Sources/WorldEditor/MainFrm.cpp
View File

@ -694,7 +694,7 @@ void CMainFrame::OnCancelMode()
{ {
// switches out of eventual direct screen mode // switches out of eventual direct screen mode
CWorldEditorView *pwndView = (CWorldEditorView *)GetActiveView(); CWorldEditorView *pwndView = (CWorldEditorView *)GetActiveView();
if (pwndView = NULL) { if (pwndView != NULL) {
// get the MDIChildFrame of active window // get the MDIChildFrame of active window
CChildFrame *pfrChild = (CChildFrame *)pwndView->GetParentFrame(); CChildFrame *pfrChild = (CChildFrame *)pwndView->GetParentFrame();
ASSERT(pfrChild!=NULL); ASSERT(pfrChild!=NULL);
@ -707,7 +707,7 @@ void CMainFrame::OnInitMenu(CMenu* pMenu)
{ {
// switches out of eventual direct screen mode // switches out of eventual direct screen mode
CWorldEditorView *pwndView = (CWorldEditorView *)GetActiveView(); CWorldEditorView *pwndView = (CWorldEditorView *)GetActiveView();
if (pwndView = NULL) { if (pwndView != NULL) {
// get the MDIChildFrame of active window // get the MDIChildFrame of active window
CChildFrame *pfrChild = (CChildFrame *)pwndView->GetParentFrame(); CChildFrame *pfrChild = (CChildFrame *)pwndView->GetParentFrame();
ASSERT(pfrChild!=NULL); ASSERT(pfrChild!=NULL);

4
Sources/WorldEditor/PropertyComboBar.cpp
View File

@ -1851,8 +1851,8 @@ CEntity *CPropertyComboBar::GetSelectedEntityPtr(void)
CPropertyID *ppidProperty = GetSelectedProperty(); CPropertyID *ppidProperty = GetSelectedProperty();
// if there is valid property selected // if there is valid property selected
if( (ppidProperty == NULL) || if( (ppidProperty == NULL) ||
(ppidProperty->pid_eptType != CEntityProperty::EPT_ENTITYPTR) || ((ppidProperty->pid_eptType != CEntityProperty::EPT_ENTITYPTR) &&
(ppidProperty->pid_eptType != CEntityProperty::EPT_PARENT) ) (ppidProperty->pid_eptType != CEntityProperty::EPT_PARENT)) )
{ {
return NULL; return NULL;
} }

1
Sources/WorldEditor/WorldEditor.h
View File

@ -582,7 +582,6 @@ inline BOOL CValuesForPrimitive::operator==(const CValuesForPrimitive &vfpToComp
(vfp_plPrimitive == vfpToCompare.vfp_plPrimitive) && (vfp_plPrimitive == vfpToCompare.vfp_plPrimitive) &&
(vfp_ttTriangularisationType == vfpToCompare.vfp_ttTriangularisationType) && (vfp_ttTriangularisationType == vfpToCompare.vfp_ttTriangularisationType) &&
(vfp_bDummy == vfpToCompare.vfp_bDummy) && (vfp_bDummy == vfpToCompare.vfp_bDummy) &&
(vfp_ptPrimitiveType == vfpToCompare.vfp_ptPrimitiveType) &&
(vfp_bAutoCreateMipBrushes == vfpToCompare.vfp_bAutoCreateMipBrushes) && (vfp_bAutoCreateMipBrushes == vfpToCompare.vfp_bAutoCreateMipBrushes) &&
(vfp_colSectorsColor == vfpToCompare.vfp_colSectorsColor) && (vfp_colSectorsColor == vfpToCompare.vfp_colSectorsColor) &&
(vfp_colPolygonsColor == vfpToCompare.vfp_colPolygonsColor) && (vfp_colPolygonsColor == vfpToCompare.vfp_colPolygonsColor) &&