diff --git a/sc2/ChangeLog b/sc2/ChangeLog index aa2c9ba5c..82a01d78c 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,6 @@ Changes towards version 0.7: +- No longer creating and mounting a temporary directory. It is longer used, + but it might be again at some point, for loadable modules. - SvdB - Added RNG functions that work on a supplied state - SvdB - Fixed a crash on startup if uqm.cfg did not exist, flagged and fixed by jdorje - Michael diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp index 7ad18ad10..63c268dda 100644 --- a/sc2/src/msvc++/UrQuanMasters.dsp +++ b/sc2/src/msvc++/UrQuanMasters.dsp @@ -262,10 +262,6 @@ SOURCE=..\sc2code\libs\file\files.c SOURCE=..\sc2code\libs\file\filintrn.h # End Source File -# Begin Source File - -SOURCE=..\sc2code\libs\file\temp.c -# End Source File # End Group # Begin Group "graphics" @@ -635,6 +631,18 @@ SOURCE=..\sc2code\libs\math\random.h SOURCE=..\sc2code\libs\math\sqrt.c # End Source File # End Group +# Begin Group "md5" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\sc2code\libs\md5\md5.c +# End Source File +# Begin Source File + +SOURCE=..\sc2code\libs\md5\md5.h +# End Source File +# End Group # Begin Group "memory" # PROP Default_Filter "" @@ -1491,6 +1499,10 @@ SOURCE=..\sc2code\libs\mathlib.h # End Source File # Begin Source File +SOURCE=..\sc2code\libs\md5.h +# End Source File +# Begin Source File + SOURCE=..\sc2code\libs\memlib.h # End Source File # Begin Source File diff --git a/sc2/src/sc2code/libs/file.h b/sc2/src/sc2code/libs/file.h index b1a996df2..1120b7be8 100644 --- a/sc2/src/sc2code/libs/file.h +++ b/sc2/src/sc2code/libs/file.h @@ -20,16 +20,18 @@ #define _FILE_H #include "port.h" +#include "libs/uio.h" // for bool #include "types.h" +#if 0 // from temp.h -#include "libs/uio.h" void initTempDir (void); void unInitTempDir (void); char *tempFilePath (const char *filename); extern uio_DirHandle *tempDir; +#endif // from dirs.h diff --git a/sc2/src/sc2code/libs/file/Makeinfo b/sc2/src/sc2code/libs/file/Makeinfo index 6ab667de2..858a90daa 100644 --- a/sc2/src/sc2code/libs/file/Makeinfo +++ b/sc2/src/sc2code/libs/file/Makeinfo @@ -1 +1 @@ -uqm_CFILES="dirs.c files.c temp.c" +uqm_CFILES="dirs.c files.c" diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c index c6a0ac143..f5631b7b8 100644 --- a/sc2/src/starcon2.c +++ b/sc2/src/starcon2.c @@ -169,8 +169,8 @@ main (int argc, char *argv[]) UQM_PATCH_VERSION, UQM_EXTRA_VERSION, __DATE__, __TIME__); #ifdef NETPLAY - log_add (log_User, "Netplay protocol version %d.%d. Requiring remote " - "UQM version %d.%d.%d.", + log_add (log_User, "Netplay protocol version %d.%d. Minimum required " + "remote UQM version is %d.%d.%d.", NETPLAY_PROTOCOL_VERSION_MAJOR, NETPLAY_PROTOCOL_VERSION_MINOR, NETPLAY_MIN_UQM_VERSION_MAJOR, NETPLAY_MIN_UQM_VERSION_MINOR, NETPLAY_MIN_UQM_VERSION_PATCH); @@ -418,7 +418,9 @@ main (int argc, char *argv[]) HFree ((void *) options.addons); prepareMeleeDir (); prepareSaveDir (); +#if 0 initTempDir (); +#endif InitTimeSystem (); InitTaskSystem (); @@ -454,7 +456,9 @@ main (int argc, char *argv[]) TFB_FlushGraphics (); } +#if 0 unInitTempDir (); +#endif uninitIO (); #ifdef NETPLAY