CSFile Windows creation file mode fix (#1205)

Sphereserver · Jan 31, 2024 · 646b9d1 · 646b9d1
1 parent a5d5714
commit 646b9d1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/common/sphere_library/CSFile.cpp b/src/common/sphere_library/CSFile.cpp
@@ -131,13 +131,17 @@ bool CSFile::_Open( lpctstr ptcFilename, uint uiModeFlags )
         dwShareMode = 0;
 
     if ( uiModeFlags & OF_CREATE )
-        dwCreationDisposition = (OPEN_ALWAYS|CREATE_NEW);
+        dwCreationDisposition = CREATE_ALWAYS;
     else
         dwCreationDisposition = OPEN_EXISTING;
 
     _fileDescriptor = CreateFile( ptcFilename, dwDesiredAccess, dwShareMode, nullptr, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, nullptr );
 #else
-    _fileDescriptor = open( ptcFilename, uiModeFlags );
+    uint uiFilePermissions = 0;
+    if (uiModeFlags & OF_CREATE)
+        uiFilePermissions = (S_IRWXU | S_IRWXG | S_IRWXO); //777
+
+    _fileDescriptor = open( ptcFilename, uiModeFlags, uiFilePermissions);
 #endif // _WIN32
 
     return (_fileDescriptor != _kInvalidFD);
@@ -492,4 +496,4 @@ bool CSFile::FileExists(lpctstr ptcFilePath) // static
     struct stat fileStat;
     return ( stat( ptcFilePath, &fileStat) != -1 );
 #endif
-}
+}
diff --git a/src/game/chars/CChar.cpp b/src/game/chars/CChar.cpp
@@ -1558,7 +1558,6 @@ bool CChar::SetDispID(CREID_TYPE id)
     return true;
 }
 
-// Just set the base id and not the actual display id.
 // NOTE: Never return nullptr
 void CChar::SetID( CREID_TYPE id )
 {
@@ -1576,7 +1575,10 @@ void CChar::SetID( CREID_TYPE id )
 
 		pCharDef = CCharBase::FindCharBase(id);
 	}
-
+
+    //Update DispId
+    m_dwDispIndex = id;
+
 	ASSERT(pCharDef != nullptr);
 
 	CCharBase* pCharOldDef = Char_GetDef();