Mercurial > mm7
comparison mm7_2.cpp @ 2032:b9e11e88b157
Merge
author | Ritor1 |
---|---|
date | Mon, 18 Nov 2013 20:17:37 +0600 |
parents | e21db9518295 136b4d8d36f6 |
children | e78fa9082174 |
comparison
equal
deleted
inserted
replaced
2031:e21db9518295 | 2032:b9e11e88b157 |
---|---|
4301 bool all_magic = true; | 4301 bool all_magic = true; |
4302 bool wizard_eye = false; | 4302 bool wizard_eye = false; |
4303 bool debug_information = false; | 4303 bool debug_information = false; |
4304 bool show_picked_face = false; | 4304 bool show_picked_face = false; |
4305 bool draw_debug_line = false; | 4305 bool draw_debug_line = false; |
4306 bool new_speed = true; | |
4306 | 4307 |
4307 //----- (00462C94) -------------------------------------------------------- | 4308 //----- (00462C94) -------------------------------------------------------- |
4308 bool MM_Main(const wchar_t *pCmdLine) | 4309 bool MM_Main(const wchar_t *pCmdLine) |
4309 { | 4310 { |
4310 IntegrityTest(); | 4311 IntegrityTest(); |
4358 Rect.right = *(int *)(v8 + 8); | 4359 Rect.right = *(int *)(v8 + 8); |
4359 Rect.bottom = *(int *)(v8 + 12); | 4360 Rect.bottom = *(int *)(v8 + 12); |
4360 uCPUSpeed = Rect.bottom;*/ | 4361 uCPUSpeed = Rect.bottom;*/ |
4361 uCPUSpeed = 2048; // about 2GHz | 4362 uCPUSpeed = 2048; // about 2GHz |
4362 | 4363 |
4363 constructors(); | 4364 //constructors(); |
4364 | 4365 |
4365 if (!MM7_Initialize(640, 480)) | 4366 if (!MM7_Initialize(640, 480)) |
4366 { | 4367 { |
4367 Log::Warning(L"MM init: failed"); | 4368 Log::Warning(L"MM init: failed"); |
4368 pGame->Deinitialize(); | 4369 pGame->Deinitialize(); |