Mercurial > mm7
diff mm7_2.cpp @ 942:530e3d5ab48d
Слияние
author | Ritor1 |
---|---|
date | Wed, 01 May 2013 16:04:50 +0600 |
parents | c44c9883b00f ae747684f644 |
children | ffc32cabc5f5 |
line wrap: on
line diff
--- a/mm7_2.cpp Wed May 01 16:04:37 2013 +0600 +++ b/mm7_2.cpp Wed May 01 16:04:50 2013 +0600 @@ -38,7 +38,6 @@ #include "Awards.h" #include "Autonotes.h" #include "stru160.h" -#include "stru279.h" #include "TurnEngine.h" #include "FactionTable.h" #include "StorylineTextTable.h" @@ -9303,7 +9302,6 @@ if (wcsstr(pCmdLine, L"-new_sky")) new_sky = true; } - stru_51076C.registry_debug_flags = ReadWindowsRegistryInt("debug flags", 0); /*v8 = _4AC1C9_get_cpu_speed(0, (Vec4_int_ *)a2);