Mercurial > mm7

diff mm7_2.cpp @ 1165:29a8defbad9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings removed double LOBYTE, LOWORD etd macro definitions swprintf called with string size parameter ErrD3D with too many params fix 1 or 2 other minor fixes
author Grumpy7
date Tue, 04 Jun 2013 03:21:21 +0200
parents 354ec6263123
children 15ad868d972f
line wrap: on
line diff
--- a/mm7_2.cpp	Tue Jun 04 02:03:43 2013 +0200
+++ b/mm7_2.cpp	Tue Jun 04 03:21:21 2013 +0200
@@ -1,3 +1,7 @@
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
 #include <io.h>
 #include <direct.h>
 #include <assert.h>
@@ -4257,7 +4261,7 @@
   assert(uNumMaps >= 2);
 
   for (uint i = 1; i < uNumMaps; ++i)
-    if (!strcmpi(pInfos[i].pFilename, Str2))
+    if (!_stricmp(pInfos[i].pFilename, Str2))
       return (MAP_TYPE)i;
 
   assert(false && "Map not found!");
@@ -5670,7 +5674,7 @@
   struct tagPAINTSTRUCT Paint; // [sp+24h] [bp-48h]@13
   int pXY[2]; // [sp+64h] [bp-8h]@261
   int a2; // [sp+7Ch] [bp+10h]@50
-
+  
   switch (Msg)
   {
     case WM_SETTEXT: return DefWindowProcW(hWnd, Msg, wParam, lParam);
@@ -7099,7 +7103,7 @@
 
 
   wchar_t pMagicPath[1024];
-  swprintf(pMagicPath, L"%C:\\anims\\magic7.vid", c);
+  swprintf(pMagicPath, wcslen(L"%C:\\anims\\magic7.vid"), L"%C:\\anims\\magic7.vid", c);
   if (GetFileAttributesW(pMagicPath) == -1)
     return false;