changeset 2253:aff7a7b072b7

adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf
author Grumpy7
date Wed, 26 Feb 2014 23:35:23 +0100
parents 3cc3a29f073b
children 2e02c384c62b
files AIL.cpp Actor.cpp Arcomage.cpp ArcomageCards.cpp AudioPlayer.cpp BSPModel.cpp Bink_Smacker.cpp CastSpellInfo.cpp Chest.cpp Conditions.cpp DecalBuilder.cpp DecorationList.cpp ErrorHandling.h Events.cpp FrameTableInc.cpp GUIButton.cpp GUIFont.cpp GUIProgressBar.cpp GUIWindow.cpp Game.cpp GammaControl.cpp IconFrameTable.cpp Indoor.cpp IndoorCameraD3D.cpp Items.cpp Keyboard.cpp LOD.cpp Level/Decoration.cpp LightmapBuilder.cpp LightsStack.cpp Log.cpp LuaVM.cpp Monsters.cpp Mouse.cpp NPC.cpp NewUI/MainMenu.cpp OSAPI.cpp OSWindow.cpp ObjectList.cpp Outdoor.cpp Overlays.cpp PaletteManager.cpp ParticleEngine.cpp Party.cpp Player.cpp Random.cpp Render.cpp Render.h SaveLoad.cpp Spells.cpp SpriteObject.cpp Sprites.cpp StorylineTextTable.cpp Texture.cpp TileTable.cpp Timer.cpp TurnEngine.cpp UI/Books/UIMapBook.cpp UI/Books/UINotesBooks.cpp UI/Books/UISpellBook.cpp UI/UIBooks.cpp UI/UICharacter.cpp UI/UIGuilds.cpp UI/UIHouses.cpp UI/UIMainMenu.cpp UI/UIOptions.cpp UI/UIPartyCreation.cpp UI/UIPopup.cpp UI/UIRest.cpp UI/UISaveLoad.cpp UI/UIShops.cpp UI/UITransition.cpp UI/UiGame.cpp VectorTypes.cpp VideoPlayer.cpp Viewport.cpp Vis.cpp Weather.cpp _deleted.cpp mm7_2.cpp mm7_3.cpp mm7_4.cpp mm7_5.cpp mm7_6.cpp mm7_7.cpp mm7_data.cpp mm7_data.h mm7text_ru.cpp stru10.cpp stru6.cpp stru9.cpp texts.cpp
diffstat 92 files changed, 99 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/AIL.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/AIL.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "AIL.h"
 
 
--- a/Actor.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Actor.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,5 @@
+#define _CRT_SECURE_NO_WARNINGS
+
 #include "mm7_data.h"
 #include "DecalBuilder.h"
 
--- a/Arcomage.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Arcomage.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string>
 
 #include "Render.h"
--- a/ArcomageCards.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/ArcomageCards.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 
 #include "Arcomage.h"
 ArcomageCard pCards[87] = 
--- a/AudioPlayer.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/AudioPlayer.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 
 #include <string>
 
--- a/BSPModel.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/BSPModel.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "BSPModel.h"
--- a/Bink_Smacker.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Bink_Smacker.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Bink_Smacker.h"
 
 
--- a/CastSpellInfo.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/CastSpellInfo.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "CastSpellInfo.h"
 #include "Actor.h"
 #include "Party.h"
--- a/Chest.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Chest.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdio.h>
 
 #include "BSPModel.h"
--- a/Conditions.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Conditions.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #pragma once
 #include "Conditions.h"
 #include "Party.h"
--- a/DecalBuilder.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/DecalBuilder.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "DecalBuilder.h"
 #include "Game.h"
 #include "Timer.h"
--- a/DecorationList.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/DecorationList.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Sprites.h"
 #include "DecorationList.h"
 #include "MM7.h"
--- a/ErrorHandling.h	Wed Feb 26 01:26:22 2014 +0100
+++ b/ErrorHandling.h	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_NON_CONFORMING_SWPRINTFS
 #pragma once
 
 #define Error(format, ...)             Error_impl_(__FILE__, __FUNCTION__, __LINE__, format, __VA_ARGS__)
@@ -19,7 +20,7 @@
     vsprintf(msg_body, format, va);
 
     wchar_t msg[sizeof(header) + sizeof(msg_body)];
-    swprintf(msg, L"%S %S", header, msg_body);
+    swprintf(msg, 8192, L"%S %S", header, msg_body);
 
     extern void MsgBox(const wchar_t *, const wchar_t *);
     MsgBox(msg, L"Error");
@@ -47,9 +48,9 @@
     
     wchar_t msg[sizeof(header) + sizeof(msg_body)];
     if (format)
-      swprintf(msg, L"%S %S", header, msg_body);
+      swprintf(msg, (sizeof(header) + sizeof(msg_body)), L"%S %S", header, msg_body);
     else
-      swprintf(msg, L"%S", header);
+      swprintf(msg, (sizeof(header) + sizeof(msg_body)), L"%S", header);
 
     extern void MsgBox(const wchar_t *, const wchar_t *);
     MsgBox(msg, L"Assertion");
--- a/Events.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Events.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "Weather.h"
--- a/FrameTableInc.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/FrameTableInc.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "FrameTableInc.h"
 #include <memory.h>
 //identical function to work in differnt threads
--- a/GUIButton.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/GUIButton.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "GUIWindow.h"
 #include "GUIFont.h"
 
--- a/GUIFont.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/GUIFont.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string>
 
 #include "LOD.h"
--- a/GUIProgressBar.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/GUIProgressBar.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "GUIProgressBar.h"
 #include "LOD.h"
 #include "Mouse.h"
--- a/GUIWindow.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/GUIWindow.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "GUIWindow.h"
 #include "GUIFont.h"
 #include "Party.h"
--- a/Game.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Game.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Vis.h"
 #include "Weather.h"
 #include "LightmapBuilder.h"
--- a/GammaControl.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/GammaControl.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string>
 
 #include "GammaControl.h"
--- a/IconFrameTable.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/IconFrameTable.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "IconFrameTable.h"
 #include "LOD.h"
 #include "mm7_data.h"
--- a/Indoor.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Indoor.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "LightmapBuilder.h"
 #include "DecalBuilder.h"
 #include "stru9.h"
--- a/IndoorCameraD3D.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/IndoorCameraD3D.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "IndoorCameraD3D.h"
 #include "VectorTypes.h"
 #include "Game.h"
--- a/Items.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Items.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "Items.h"
--- a/Keyboard.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Keyboard.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Keyboard.h"
 #include "GUIWindow.h"
 #include "Game.h"
--- a/LOD.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/LOD.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "LOD.h"
 #include "Render.h"
 #include "PaletteManager.h"
--- a/Level/Decoration.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Level/Decoration.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Decoration.h"
 #include "../Party.h"
 #include "../ErrorHandling.h"
--- a/LightmapBuilder.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/LightmapBuilder.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "LightmapBuilder.h"
 #include "Game.h"
 #include "stru314.h"
--- a/LightsStack.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/LightsStack.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string>
 #include "Lights.h"
 
--- a/Log.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Log.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Log.h"
 
 #include <stdio.h>
--- a/LuaVM.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/LuaVM.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "LuaVM.h"
 #include "lib/lua/lua.h"
 #include "Log.h"
--- a/Monsters.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Monsters.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
--- a/Mouse.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Mouse.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Texture.h"
 #include "mm7_data.h"
 #include "Render.h"
--- a/NPC.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/NPC.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "texts.h"
 #include "LOD.h"
 #include "Autonotes.h"
--- a/NewUI/MainMenu.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/NewUI/MainMenu.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,4 +1,5 @@
-#include "MainMenu.h"è
+#define _CRT_SECURE_NO_WARNINGS
+#include "MainMenu.h"
 #include "..\LOD.h"
 
 bool MainMenuWindow::OnMouseLeftClick(int x, int y)
--- a/OSAPI.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/OSAPI.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "OSAPI.h"
 #include "OSInfo.h"
 #include "Log.h"
--- a/OSWindow.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/OSWindow.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "OSWindow.h"
 #include "mm7_data.h"
 #include "Arcomage.h"
--- a/ObjectList.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/ObjectList.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "ObjectList.h"
 #include "mm7_data.h"
 #include "Sprites.h"
--- a/Outdoor.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Outdoor.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "stru6.h"
 #include "Weather.h"
 #include "Sprites.h"
--- a/Overlays.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Overlays.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "Overlays.h"
--- a/PaletteManager.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/PaletteManager.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "PaletteManager.h"
 #include "Texture.h"
 #include "Game.h"
--- a/ParticleEngine.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/ParticleEngine.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "ParticleEngine.h"
 #include "Timer.h"
 #include "Render.h"
--- a/Party.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Party.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Party.h"
 #include "MapInfo.h"
 #include "Timer.h"
--- a/Player.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Player.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "stru6.h"
 
 #include "Player.h"
--- a/Random.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Random.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <math.h>
 
 #include "Random.h"
--- a/Render.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Render.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,5 @@
+#define _CRT_SECURE_NO_WARNINGS
+
 #include "Render.h"
 #include "Outdoor_stuff.h"
 #include "VideoPlayer.h"
--- a/Render.h	Wed Feb 26 01:26:22 2014 +0100
+++ b/Render.h	Wed Feb 26 23:35:23 2014 +0100
@@ -240,13 +240,14 @@
 
 /*  183 */
 #pragma pack(push, 1)
-struct RenderD3D
+class RenderD3D
 {
+public:
   RenderD3D();
   
   void GetAvailableDevices(RenderD3D__DevInfo **pOutDevices);
   void Release();
-  bool CreateDevice(unsigned int uDeviceID, int bWindowed, struct OSWindow *window);
+  bool CreateDevice(unsigned int uDeviceID, int bWindowed, OSWindow *window);
   unsigned int GetDeviceCaps();
   void ClearTarget(unsigned int bClearColor, unsigned int uClearColor, unsigned int bClearDepth, float z_clear);
   void Present(bool bForceBlit);
--- a/SaveLoad.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/SaveLoad.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <io.h>
 #include <direct.h>
 
--- a/Spells.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Spells.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "Spells.h"
--- a/SpriteObject.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/SpriteObject.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "BSPModel.h"
 #include "SpriteObject.h"
 #include "Party.h"
--- a/Sprites.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Sprites.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string.h>
 #include <algorithm>
 
--- a/StorylineTextTable.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/StorylineTextTable.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 #include <string.h>
 
--- a/Texture.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Texture.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "Texture.h"
--- a/TileTable.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/TileTable.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/Timer.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Timer.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 
 #include "Timer.h"
 #include "Keyboard.h"
--- a/TurnEngine.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/TurnEngine.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 
 #include "MM7.h"
 #include "mm7_data.h"
--- a/UI/Books/UIMapBook.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/Books/UIMapBook.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\..\MM7.h"
 #include "..\..\Render.h"
 #include "..\..\Mouse.h"
--- a/UI/Books/UINotesBooks.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/Books/UINotesBooks.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\..\MM7.h"
 #include "..\..\Render.h"
 #include "..\..\Mouse.h"
--- a/UI/Books/UISpellBook.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/Books/UISpellBook.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\..\MM7.h"
 #include "..\..\Render.h"
 #include "..\..\Mouse.h"
--- a/UI/UIBooks.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIBooks.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\MM7.h"
 #include "UIBooks.h"
 #include "..\Render.h"
--- a/UI/UICharacter.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UICharacter.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <algorithm> 
 #include "..\MM7.h"
 #include "..\MapInfo.h"
--- a/UI/UIGuilds.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIGuilds.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\Items.h"
 #include "..\GUIWindow.h"
 #include "..\mm7_data.h"
--- a/UI/UIHouses.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIHouses.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\Texture.h"
 #include "..\mm7_data.h"
 #include "UIHouses.h"
--- a/UI/UIMainMenu.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIMainMenu.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\Mouse.h"
 #include "..\Keyboard.h"
 
--- a/UI/UIOptions.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIOptions.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\MM7.h"
 
 #include "..\Keyboard.h"
--- a/UI/UIPartyCreation.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIPartyCreation.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\Mouse.h"
 #include "..\Keyboard.h"
 
--- a/UI/UIPopup.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIPopup.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\MM7.h"
 
 #include "..\Mouse.h"
--- a/UI/UIRest.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIRest.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\GUIWindow.h"
 #include "..\GUIFont.h"
 #include "..\Party.h"
--- a/UI/UISaveLoad.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UISaveLoad.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <io.h>
 
 #include "..\MM7.h"
--- a/UI/UIShops.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UIShops.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\Items.h"
 #include "..\GUIWindow.h"
 #include "..\mm7_data.h"
--- a/UI/UITransition.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UITransition.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <io.h>
 
 #include "..\mm7_data.h"
--- a/UI/UiGame.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/UI/UiGame.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "..\Texture.h"
 #include "..\MM7.h"
 
--- a/VectorTypes.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/VectorTypes.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <utility>
 
 #include "mm7_data.h"
--- a/VideoPlayer.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/VideoPlayer.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 
 #include "Bink_Smacker.h"
 
--- a/Viewport.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Viewport.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Viewport.h"
 
 #include "Party.h"
--- a/Vis.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Vis.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Vis.h"
 #include "Outdoor.h"
 #include "BSPModel.h"
--- a/Weather.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/Weather.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 
 #include "Weather.h"
--- a/_deleted.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/_deleted.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 /*
 
 
--- a/mm7_2.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_2.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <io.h>
 #include <direct.h>
 
--- a/mm7_3.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_3.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "Weather.h"
 #include "Texture.h"
 #include "mm7_data.h"
--- a/mm7_4.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_4.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "mm7_data.h"
 #include "mm7_unsorted_subs.h"
 #include "Texture.h"
--- a/mm7_5.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_5.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "MapInfo.h"
 #include "LightmapBuilder.h"
 #include "mm7.h"
--- a/mm7_6.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_6.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "MM7.h"
 
 #include "Weather.h"
--- a/mm7_7.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_7.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "mm7_data.h"
 #include "Render.h"
 #include "texts.h"
--- a/mm7_data.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_data.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "mm7_data.h"
 
 #include "GUIWindow.h"
--- a/mm7_data.h	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7_data.h	Wed Feb 26 23:35:23 2014 +0100
@@ -24,7 +24,6 @@
 
 
 
-
 #if defined(__GNUC__)
   typedef          long long ll;
   typedef unsigned long long ull;
--- a/mm7text_ru.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/mm7text_ru.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/stru10.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/stru10.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "stru10.h"
 #include "Render.h"
 #include "Indoor.h"
--- a/stru6.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/stru6.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "stru6.h"
 
 #include "mm7_data.h"
--- a/stru9.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/stru9.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include "stru9.h"
 #include "IndoorCameraD3D.h"
 
--- a/texts.cpp	Wed Feb 26 01:26:22 2014 +0100
+++ b/texts.cpp	Wed Feb 26 23:35:23 2014 +0100
@@ -1,3 +1,4 @@
+#define _CRT_SECURE_NO_WARNINGS
 #include <string.h>
 
 #include "LOD.h"