# HG changeset patch # User Grumpy7 # Date 1393454123 -3600 # Node ID aff7a7b072b7d30f4cc25d75bc5d94a651a63788 # Parent 3cc3a29f073bb3f8c8a741ee9bf560cca3c3db9a adding _CRT_SECURE_NO_WARNINGS to get rid of a few hundrer annoying warnings + adding count parameter to swprintf diff -r 3cc3a29f073b -r aff7a7b072b7 AIL.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Actor.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Arcomage.cpp --- 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 #include "Render.h" diff -r 3cc3a29f073b -r aff7a7b072b7 ArcomageCards.cpp --- 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] = diff -r 3cc3a29f073b -r aff7a7b072b7 AudioPlayer.cpp --- 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 diff -r 3cc3a29f073b -r aff7a7b072b7 BSPModel.cpp --- 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 #include "BSPModel.h" diff -r 3cc3a29f073b -r aff7a7b072b7 Bink_Smacker.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 CastSpellInfo.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Chest.cpp --- 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 #include "BSPModel.h" diff -r 3cc3a29f073b -r aff7a7b072b7 Conditions.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 DecalBuilder.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 DecorationList.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 ErrorHandling.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"); diff -r 3cc3a29f073b -r aff7a7b072b7 Events.cpp --- 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 #include "Weather.h" diff -r 3cc3a29f073b -r aff7a7b072b7 FrameTableInc.cpp --- 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 //identical function to work in differnt threads diff -r 3cc3a29f073b -r aff7a7b072b7 GUIButton.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 GUIFont.cpp --- 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 #include "LOD.h" diff -r 3cc3a29f073b -r aff7a7b072b7 GUIProgressBar.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 GUIWindow.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Game.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 GammaControl.cpp --- 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 #include "GammaControl.h" diff -r 3cc3a29f073b -r aff7a7b072b7 IconFrameTable.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Indoor.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 IndoorCameraD3D.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Items.cpp --- 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 #include "Items.h" diff -r 3cc3a29f073b -r aff7a7b072b7 Keyboard.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 LOD.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Level/Decoration.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 LightmapBuilder.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 LightsStack.cpp --- 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 #include "Lights.h" diff -r 3cc3a29f073b -r aff7a7b072b7 Log.cpp --- 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 diff -r 3cc3a29f073b -r aff7a7b072b7 LuaVM.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Monsters.cpp --- 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 #include #include diff -r 3cc3a29f073b -r aff7a7b072b7 Mouse.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 NPC.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 NewUI/MainMenu.cpp --- 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) diff -r 3cc3a29f073b -r aff7a7b072b7 OSAPI.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 OSWindow.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 ObjectList.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Outdoor.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Overlays.cpp --- 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 #include "Overlays.h" diff -r 3cc3a29f073b -r aff7a7b072b7 PaletteManager.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 ParticleEngine.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Party.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Player.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Random.cpp --- 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 #include "Random.h" diff -r 3cc3a29f073b -r aff7a7b072b7 Render.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Render.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); diff -r 3cc3a29f073b -r aff7a7b072b7 SaveLoad.cpp --- 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 #include diff -r 3cc3a29f073b -r aff7a7b072b7 Spells.cpp --- 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 #include "Spells.h" diff -r 3cc3a29f073b -r aff7a7b072b7 SpriteObject.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Sprites.cpp --- 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 #include diff -r 3cc3a29f073b -r aff7a7b072b7 StorylineTextTable.cpp --- 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 #include diff -r 3cc3a29f073b -r aff7a7b072b7 Texture.cpp --- 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 #include "Texture.h" diff -r 3cc3a29f073b -r aff7a7b072b7 TileTable.cpp --- 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 #include #include diff -r 3cc3a29f073b -r aff7a7b072b7 Timer.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 TurnEngine.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/Books/UIMapBook.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/Books/UINotesBooks.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/Books/UISpellBook.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIBooks.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UICharacter.cpp --- 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 #include "..\MM7.h" #include "..\MapInfo.h" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIGuilds.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIHouses.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIMainMenu.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIOptions.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIPartyCreation.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIPopup.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIRest.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UISaveLoad.cpp --- 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 #include "..\MM7.h" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UIShops.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UITransition.cpp --- 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 #include "..\mm7_data.h" diff -r 3cc3a29f073b -r aff7a7b072b7 UI/UiGame.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 VectorTypes.cpp --- 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 #include "mm7_data.h" diff -r 3cc3a29f073b -r aff7a7b072b7 VideoPlayer.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Viewport.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Vis.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 Weather.cpp --- 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 #include "Weather.h" diff -r 3cc3a29f073b -r aff7a7b072b7 _deleted.cpp --- 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 /* diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_2.cpp --- 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 #include diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_3.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_4.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_5.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_6.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_7.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_data.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 mm7_data.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; diff -r 3cc3a29f073b -r aff7a7b072b7 mm7text_ru.cpp --- 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 #include #include diff -r 3cc3a29f073b -r aff7a7b072b7 stru10.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 stru6.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 stru9.cpp --- 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" diff -r 3cc3a29f073b -r aff7a7b072b7 texts.cpp --- 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 #include "LOD.h"