Mercurial > mm7

comparison mm7_2.cpp @ 942:530e3d5ab48d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 01 May 2013 16:04:50 +0600
parents c44c9883b00f ae747684f644
children ffc32cabc5f5
comparison
equal deleted inserted replaced
941:c44c9883b00f 942:530e3d5ab48d
36 #include "TileFrameTable.h" 36 #include "TileFrameTable.h"
37 #include "PlayerFrameTable.h" 37 #include "PlayerFrameTable.h"
38 #include "Awards.h" 38 #include "Awards.h"
39 #include "Autonotes.h" 39 #include "Autonotes.h"
40 #include "stru160.h" 40 #include "stru160.h"
41 #include "stru279.h"
42 #include "TurnEngine.h" 41 #include "TurnEngine.h"
43 #include "FactionTable.h" 42 #include "FactionTable.h"
44 #include "StorylineTextTable.h" 43 #include "StorylineTextTable.h"
45 #include "Random.h" 44 #include "Random.h"
46 #include "CastSpellInfo.h" 45 #include "CastSpellInfo.h"
9301 if (wcsstr(pCmdLine, L"-nocd")) 9300 if (wcsstr(pCmdLine, L"-nocd"))
9302 bNoCD = true; 9301 bNoCD = true;
9303 if (wcsstr(pCmdLine, L"-new_sky")) 9302 if (wcsstr(pCmdLine, L"-new_sky"))
9304 new_sky = true; 9303 new_sky = true;
9305 } 9304 }
9306 stru_51076C.registry_debug_flags = ReadWindowsRegistryInt("debug flags", 0);
9307 9305
9308 9306
9309 /*v8 = _4AC1C9_get_cpu_speed(0, (Vec4_int_ *)a2); 9307 /*v8 = _4AC1C9_get_cpu_speed(0, (Vec4_int_ *)a2);
9310 Rect.left = *(int *)v8; 9308 Rect.left = *(int *)v8;
9311 Rect.top = *(int *)(v8 + 4); 9309 Rect.top = *(int *)(v8 + 4);