1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

************************************************************

Browse Source 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/LoadScreen.cpp
+9 -6
View File
@@ -43,9 +43,11 @@
#include "Item Statistics.h"
#include "Scheduling.h"
#include "MessageBoxScreen.h"
#include "VFS/vfs.h"//dnl ch37 110909
#include <vfs/Core/vfs.h>//dnl ch37 110909
#endif
INT16 gsMouseWheelDeltaValue;
//===========================================================================
BOOLEAN gfErrorCatch = FALSE;
@@ -190,7 +192,7 @@ void LoadSaveScreenEntry()
vfs::CVirtualProfile::FileIterator fit = prof->files(L"MAPS/*");
while(!fit.end())
{
utf8string fname = fit.value()->getName().c_str();
vfs::String fname = fit.value()->getName().c_str();
memset(&FileInfo, 0, sizeof(GETFILESTRUCT));
strcpy(FileInfo.zFileName, fname.utf8().c_str());
FileInfo.uiFileSize = fname.length();
@@ -1013,8 +1015,7 @@ UINT32 ProcessFileIO()
return(EDIT_SCREEN);
}
gbCurrentFileIOStatus = IOSTATUS_NONE;
utf8string msg = utf8string(" Error saving ") + ubNewFilename + utf8string(" file. Try another filename? ");
CreateMessageBox((STR16)msg.c_wcs().c_str());
CreateMessageBox((STR16)(_BS(L" Error saving ") << (const char*)ubNewFilename << L" file. Try another filename? " << _BS::wget).c_str() );
return(guiCurrentScreen);
}
if( gfShowPits )
@@ -1035,6 +1036,9 @@ UINT32 ProcessFileIO()
InitErrorCatchDialog();
return EDIT_SCREEN;
}
fNewMapSaved = TRUE;
return EDIT_SCREEN;
case INITIATE_MAP_LOAD: //draw load message
SaveFontSettings();
@@ -1056,8 +1060,7 @@ UINT32 ProcessFileIO()
gbCurrentFileIOStatus = IOSTATUS_NONE;
gfGlobalError = FALSE;
gfLoadError = TRUE;
utf8string msg = utf8string(" Error loading ") + ubNewFilename + utf8string(" file. Try another filename? ");
CreateMessageBox((STR16)msg.c_wcs().c_str());
CreateMessageBox((STR16)(_BS(L" Error loading ") << (const char*)ubNewFilename << L" file. Try another filename? " << _BS::wget).c_str());
return(guiCurrentScreen);
}
//ADB these are NOT set yet! but they need to be, duh