comparison mm7_2.cpp @ 1067:a19cdcaa36fe

merge error
author zipi
date Fri, 24 May 2013 09:33:38 +0100
parents e86b4951da70
children 5d5c78088274 62c759bc49f7
comparison
equal deleted inserted replaced
1066:938af16d5b88 1067:a19cdcaa36fe
5444 } 5444 }
5445 } 5445 }
5446 5446
5447 //----- (00458244) -------------------------------------------------------- 5447 //----- (00458244) --------------------------------------------------------
5448 int SkillToMastery( unsigned int skill_value ) 5448 int SkillToMastery( unsigned int skill_value )
5449 { 5449 {
5450 switch (skill_value & 0x1C0) 5450 switch (skill_value & 0x1C0)
5451 { 5451 {
5452 case 0x100: return 4; // Grandmaster 5452 case 0x100: return 4; // Grandmaster
5453 case 0x80: return 3; // Master 5453 case 0x80: return 3; // Master
5454 case 0x40: return 2; // Expert 5454 case 0x40: return 2; // Expert
6813 { 6813 {
6814 case 103: pRenderer->SavePCXScreenshot(); return 0; 6814 case 103: pRenderer->SavePCXScreenshot(); return 0;
6815 6815
6816 case 101: // Quit game 6816 case 101: // Quit game
6817 case 40001: 6817 case 40001:
6818 { 6818 SendMessageA(::hWnd, WM_DESTROY, 0, 0);
6819 v38 = 0;
6820 v37 = 0;
6821 v36 = 2;
6822 v35 = ::hWnd;
6823 SendMessageA(::hWnd, WM_DESTROY, v37, v38);
6824 }
6825 return 0; 6819 return 0;
6826 6820
6827 6821
6828 case 104: 6822 case 104:
6829 pRenderer->ChangeBetweenWinFullscreenModes(); 6823 pRenderer->ChangeBetweenWinFullscreenModes();
7190 } 7184 }
7191 if ( !pArcomageGame->bGameInProgress ) 7185 if ( !pArcomageGame->bGameInProgress )
7192 { 7186 {
7193 if ( pVideoPlayer->pVideoFrame.pPixels ) 7187 if ( pVideoPlayer->pVideoFrame.pPixels )
7194 pVideoPlayer->bStopBeforeSchedule = 1; 7188 pVideoPlayer->bStopBeforeSchedule = 1;
7195 if ( wParam != VK_RETURN ) 7189 if ( wParam == VK_RETURN )
7196 { 7190 {
7197 if ( wParam == VK_CONTROL ) 7191 if ( !viewparams->field_4C )
7198 { 7192 UI_OnKeyDown(wParam);
7199 dword_507B98_ctrl_pressed = 1; 7193 return 0;
7194 }
7195 if ( wParam == VK_CONTROL )
7196 {
7197 dword_507B98_ctrl_pressed = 1;
7198 return 0;
7199 }
7200 if ( wParam == VK_ESCAPE )
7201 {
7202 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, window_SpeakInHouse != 0, 0);
7203 return 0;
7204 }
7205 if ( wParam <= VK_HOME )
7206 return 0;
7207 if ( wParam > VK_DOWN )
7208 {
7209 if ( wParam != VK_F4 || pVideoPlayer->AnyMovieLoaded() )
7200 return 0; 7210 return 0;
7201 } 7211 SendMessageA(hWnd, WM_COMMAND, 104, 0);
7202 if ( wParam == VK_ESCAPE ) 7212 return 0;
7203 { 7213 }
7204 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, window_SpeakInHouse != 0, 0); 7214 if ( wParam >= VK_LEFT && wParam <= VK_DOWN )
7215 {
7216 if ( pCurrentScreen != SCREEN_GAME && pCurrentScreen != SCREEN_PRESS_ESCAPE_MESSAGE )
7217 {
7218 if ( !viewparams->field_4C )
7219 UI_OnKeyDown(wParam);
7205 return 0; 7220 return 0;
7206 } 7221 }
7207 if ( wParam <= VK_HOME ) 7222 }
7208 return 0; 7223 if ( pCurrentScreen != SCREEN_GAME && pCurrentScreen != SCREEN_PRESS_ESCAPE_MESSAGE )
7209 if ( wParam > VK_DOWN ) 7224 return 0;
7210 {
7211 if ( wParam != VK_F4 || pVideoPlayer->AnyMovieLoaded() )
7212 return 0;
7213 v38 = 0;
7214 v37 = 104;
7215 //LABEL_126:
7216 v36 = 273;
7217 v35 = hWnd;
7218 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7219 return 0;
7220 }
7221 if ( pCurrentScreen != SCREEN_GAME
7222 && pCurrentScreen != SCREEN_PRESS_ESCAPE_MESSAGE )
7223 return 0;
7224 }
7225 if ( !viewparams->field_4C )
7226 UI_OnKeyDown(wParam);
7227 return 0;
7228 } 7225 }
7229 pArcomageGame->stru1.field_0 = 1; 7226 pArcomageGame->stru1.field_0 = 1;
7230 if ( (unsigned __int16)GetAsyncKeyState(VK_SHIFT) >> 8 >= 0 ) 7227 if ( (unsigned __int16)GetAsyncKeyState(VK_SHIFT) >> 8 >= 0 )
7231 {
7232 v27 = MapVirtualKeyA((unsigned __int16)wParam, 2u); 7228 v27 = MapVirtualKeyA((unsigned __int16)wParam, 2u);
7233 }
7234 else 7229 else
7235 { 7230 {
7236 v13 = (unsigned __int16)MapVirtualKeyA((unsigned __int16)wParam, 2u); 7231 v13 = (unsigned __int16)MapVirtualKeyA((unsigned __int16)wParam, 2u);
7237 if ( (signed int)(unsigned __int16)v13 > 54 ) 7232 if ( (signed int)(unsigned __int16)v13 > 54 )
7238 { 7233 {
7239 if ( v13 > 61 ) 7234 if ( v13 > 61 )
7240 { 7235 {
7241 v24 = v13 - 91; 7236 if ( v13 == 91 )
7242 if ( !v24 )
7243 { 7237 {
7244 LOBYTE(pArcomageGame->stru1.field_8) = 123; 7238 LOBYTE(pArcomageGame->stru1.field_8) = 123;
7245 //goto LABEL_181; 7239 //goto LABEL_181;
7246 if ( wParam == 27 ) 7240 if ( wParam == 27 )
7247 { 7241 {
7257 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7251 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7258 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7252 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7259 //goto _def_wnd_proc; 7253 //goto _def_wnd_proc;
7260 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7254 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7261 } 7255 }
7262 v38 = 0; 7256 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7263 v37 = 103;
7264 //goto LABEL_126;
7265 v36 = 273;
7266 v35 = hWnd;
7267 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7268 return 0; 7257 return 0;
7269 } 7258 }
7270 v25 = v24 - 1; 7259 if ( v13 == 92 )
7271 if ( !v25 )
7272 { 7260 {
7273 LOBYTE(pArcomageGame->stru1.field_8) = 124; 7261 LOBYTE(pArcomageGame->stru1.field_8) = 124;
7274 //goto LABEL_181; 7262 //goto LABEL_181;
7275 if ( wParam == 27 ) 7263 if ( wParam == 27 )
7276 { 7264 {
7286 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7274 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7287 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7275 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7288 //goto _def_wnd_proc; 7276 //goto _def_wnd_proc;
7289 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7277 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7290 } 7278 }
7291 v38 = 0; 7279 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7292 v37 = 103;
7293 //goto LABEL_126;
7294 v36 = 273;
7295 v35 = hWnd;
7296 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7297 return 0; 7280 return 0;
7298 } 7281 }
7299 v26 = v25 - 1; 7282 if ( v13 == 93 )
7300 if ( !v26 )
7301 { 7283 {
7302 LOBYTE(pArcomageGame->stru1.field_8) = 125; 7284 LOBYTE(pArcomageGame->stru1.field_8) = 125;
7303 //goto LABEL_181; 7285 //goto LABEL_181;
7304 if ( wParam == 27 ) 7286 if ( wParam == 27 )
7305 { 7287 {
7315 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7297 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7316 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7298 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7317 //goto _def_wnd_proc; 7299 //goto _def_wnd_proc;
7318 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7300 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7319 } 7301 }
7320 v38 = 0; 7302 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7321 v37 = 103;
7322 //goto LABEL_126;
7323 v36 = 273;
7324 v35 = hWnd;
7325 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7326 return 0; 7303 return 0;
7327 } 7304 }
7328 if ( v26 == 3 ) 7305 if ( v13 == 96 )
7329 { 7306 {
7330 LOBYTE(pArcomageGame->stru1.field_8) = 126; 7307 LOBYTE(pArcomageGame->stru1.field_8) = 126;
7331 //goto LABEL_181; 7308 //goto LABEL_181;
7332 if ( wParam == 27 ) 7309 if ( wParam == 27 )
7333 { 7310 {
7343 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7320 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7344 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7321 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7345 //goto _def_wnd_proc; 7322 //goto _def_wnd_proc;
7346 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7323 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7347 } 7324 }
7348 v38 = 0; 7325 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7349 v37 = 103;
7350 //goto LABEL_126;
7351 v36 = 273;
7352 v35 = hWnd;
7353 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7354 return 0; 7326 return 0;
7355 } 7327 }
7356 } 7328 }
7357 else 7329 else
7358 { 7330 {
7374 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7346 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7375 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7347 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7376 //goto _def_wnd_proc; 7348 //goto _def_wnd_proc;
7377 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7349 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7378 } 7350 }
7379 v38 = 0; 7351 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7380 v37 = 103;
7381 //goto LABEL_126;
7382 v36 = 273;
7383 v35 = hWnd;
7384 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7385 return 0; 7352 return 0;
7386 } 7353 }
7387 v21 = v13 - 55; 7354 if ( v13 == 55 )
7388 if ( !v21 )
7389 { 7355 {
7390 LOBYTE(pArcomageGame->stru1.field_8) = 38; 7356 LOBYTE(pArcomageGame->stru1.field_8) = 38;
7391 //goto LABEL_181; 7357 //goto LABEL_181;
7392 if ( wParam == 27 ) 7358 if ( wParam == 27 )
7393 { 7359 {
7403 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7369 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7404 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7370 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7405 //goto _def_wnd_proc; 7371 //goto _def_wnd_proc;
7406 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7372 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7407 } 7373 }
7408 v38 = 0; 7374 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7409 v37 = 103;
7410 //goto LABEL_126;
7411 v36 = 273;
7412 v35 = hWnd;
7413 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7414 return 0; 7375 return 0;
7415 } 7376 }
7416 v22 = v21 - 1; 7377 if ( v13 == 56 )
7417 if ( !v22 )
7418 { 7378 {
7419 LOBYTE(pArcomageGame->stru1.field_8) = 42; 7379 LOBYTE(pArcomageGame->stru1.field_8) = 42;
7420 //goto LABEL_181; 7380 //goto LABEL_181;
7421 if ( wParam == 27 ) 7381 if ( wParam == 27 )
7422 { 7382 {
7432 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7392 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7433 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7393 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7434 //goto _def_wnd_proc; 7394 //goto _def_wnd_proc;
7435 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7395 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7436 } 7396 }
7437 v38 = 0; 7397 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7438 v37 = 103;
7439 //goto LABEL_126;
7440 v36 = 273;
7441 v35 = hWnd;
7442 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7443 return 0; 7398 return 0;
7444 } 7399 }
7445 v23 = v22 - 1; 7400 if ( v13 == 57 )
7446 if ( !v23 )
7447 { 7401 {
7448 LOBYTE(pArcomageGame->stru1.field_8) = 40; 7402 LOBYTE(pArcomageGame->stru1.field_8) = 40;
7449 //goto LABEL_181; 7403 //goto LABEL_181;
7450 if ( wParam == 27 ) 7404 if ( wParam == 27 )
7451 { 7405 {
7461 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7415 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7462 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7416 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7463 //goto _def_wnd_proc; 7417 //goto _def_wnd_proc;
7464 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7418 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7465 } 7419 }
7466 v38 = 0; 7420 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7467 v37 = 103;
7468 //goto LABEL_126;
7469 v36 = 273;
7470 v35 = hWnd;
7471 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7472 return 0; 7421 return 0;
7473 } 7422 }
7474 if ( v23 == 2 ) 7423 if ( v13 == 59 )
7475 { 7424 {
7476 LOBYTE(pArcomageGame->stru1.field_8) = 58; 7425 LOBYTE(pArcomageGame->stru1.field_8) = 58;
7477 //goto LABEL_181; 7426 //goto LABEL_181;
7478 if ( wParam == 27 ) 7427 if ( wParam == 27 )
7479 { 7428 {
7489 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7438 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7490 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7439 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7491 //goto _def_wnd_proc; 7440 //goto _def_wnd_proc;
7492 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7441 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7493 } 7442 }
7494 v38 = 0; 7443 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7495 v37 = 103;
7496 //goto LABEL_126;
7497 v36 = 273;
7498 v35 = hWnd;
7499 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7500 return 0; 7444 return 0;
7501 } 7445 }
7502 } 7446 }
7503 } 7447 }
7504 else 7448 else
7521 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7465 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7522 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7466 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7523 //goto _def_wnd_proc; 7467 //goto _def_wnd_proc;
7524 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7468 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7525 } 7469 }
7526 v38 = 0; 7470 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7527 v37 = 103;
7528 //goto LABEL_126;
7529 v36 = 273;
7530 v35 = hWnd;
7531 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7532 return 0; 7471 return 0;
7533 } 7472 }
7534 if ( v13 > 49 ) 7473 if ( v13 > 49 )
7535 { 7474 {
7536 v18 = v13 - 50; 7475 if ( v13 == 50 )
7537 if ( !v18 )
7538 { 7476 {
7539 LOBYTE(pArcomageGame->stru1.field_8) = 64; 7477 LOBYTE(pArcomageGame->stru1.field_8) = 64;
7540 //goto LABEL_181; 7478 //goto LABEL_181;
7541 if ( wParam == 27 ) 7479 if ( wParam == 27 )
7542 { 7480 {
7552 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7490 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7553 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7491 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7554 //goto _def_wnd_proc; 7492 //goto _def_wnd_proc;
7555 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7493 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7556 } 7494 }
7557 v38 = 0; 7495 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7558 v37 = 103;
7559 //goto LABEL_126;
7560 v36 = 273;
7561 v35 = hWnd;
7562 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7563 return 0; 7496 return 0;
7564 } 7497 }
7565 v19 = v18 - 1; 7498 if ( v13 == 51 )
7566 if ( !v19 )
7567 { 7499 {
7568 LOBYTE(pArcomageGame->stru1.field_8) = 35; 7500 LOBYTE(pArcomageGame->stru1.field_8) = 35;
7569 //goto LABEL_181; 7501 //goto LABEL_181;
7570 if ( wParam == 27 ) 7502 if ( wParam == 27 )
7571 { 7503 {
7581 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7513 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7582 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7514 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7583 //goto _def_wnd_proc; 7515 //goto _def_wnd_proc;
7584 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7516 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7585 } 7517 }
7586 v38 = 0; 7518 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7587 v37 = 103;
7588 //goto LABEL_126;
7589 v36 = 273;
7590 v35 = hWnd;
7591 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7592 return 0; 7519 return 0;
7593 } 7520 }
7594 v20 = v19 - 1; 7521 if ( v13 == 52 )
7595 if ( !v20 )
7596 { 7522 {
7597 LOBYTE(pArcomageGame->stru1.field_8) = 36; 7523 LOBYTE(pArcomageGame->stru1.field_8) = 36;
7598 //goto LABEL_181; 7524 //goto LABEL_181;
7599 if ( wParam == 27 ) 7525 if ( wParam == 27 )
7600 { 7526 {
7610 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7536 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7611 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7537 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7612 //goto _def_wnd_proc; 7538 //goto _def_wnd_proc;
7613 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7539 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7614 } 7540 }
7615 v38 = 0; 7541 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7616 v37 = 103;
7617 //goto LABEL_126;
7618 v36 = 273;
7619 v35 = hWnd;
7620 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7621 return 0; 7542 return 0;
7622 } 7543 }
7623 if ( v20 == 1 ) 7544 if ( v13 == 53 )
7624 { 7545 {
7625 LOBYTE(pArcomageGame->stru1.field_8) = 37; 7546 LOBYTE(pArcomageGame->stru1.field_8) = 37;
7626 //goto LABEL_181; 7547 //goto LABEL_181;
7627 if ( wParam == 27 ) 7548 if ( wParam == 27 )
7628 { 7549 {
7638 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7559 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7639 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7560 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7640 //goto _def_wnd_proc; 7561 //goto _def_wnd_proc;
7641 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7562 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7642 } 7563 }
7643 v38 = 0; 7564 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7644 v37 = 103;
7645 //goto LABEL_126;
7646 v36 = 273;
7647 v35 = hWnd;
7648 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7649 return 0; 7565 return 0;
7650 } 7566 }
7651 } 7567 }
7652 else 7568 else
7653 { 7569 {
7669 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7585 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7670 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7586 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7671 //goto _def_wnd_proc; 7587 //goto _def_wnd_proc;
7672 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7588 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7673 } 7589 }
7674 v38 = 0; 7590 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7675 v37 = 103;
7676 //goto LABEL_126;
7677 v36 = 273;
7678 v35 = hWnd;
7679 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7680 return 0; 7591 return 0;
7681 } 7592 }
7682 v14 = v13 - 39; 7593 if ( v13 == 39 )
7683 if ( !v14 )
7684 { 7594 {
7685 LOBYTE(pArcomageGame->stru1.field_8) = 34; 7595 LOBYTE(pArcomageGame->stru1.field_8) = 34;
7686 //goto LABEL_181; 7596 //goto LABEL_181;
7687 if ( wParam == 27 ) 7597 if ( wParam == 27 )
7688 { 7598 {
7698 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7608 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7699 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7609 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7700 //goto _def_wnd_proc; 7610 //goto _def_wnd_proc;
7701 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7611 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7702 } 7612 }
7703 v38 = 0; 7613 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7704 v37 = 103;
7705 //goto LABEL_126;
7706 v36 = 273;
7707 v35 = hWnd;
7708 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7709 return 0; 7614 return 0;
7710 } 7615 }
7711 v15 = v14 - 5; 7616 if ( v13 == 44 )
7712 if ( !v15 )
7713 { 7617 {
7714 LOBYTE(pArcomageGame->stru1.field_8) = 60; 7618 LOBYTE(pArcomageGame->stru1.field_8) = 60;
7715 //goto LABEL_181; 7619 //goto LABEL_181;
7716 if ( wParam == 27 ) 7620 if ( wParam == 27 )
7717 { 7621 {
7727 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7631 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7728 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7632 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7729 //goto _def_wnd_proc; 7633 //goto _def_wnd_proc;
7730 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7634 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7731 } 7635 }
7732 v38 = 0; 7636 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7733 v37 = 103;
7734 //goto LABEL_126;
7735 v36 = 273;
7736 v35 = hWnd;
7737 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7738 return 0; 7637 return 0;
7739 } 7638 }
7740 v16 = v15 - 2; 7639 if ( v13 == 46 )
7741 if ( !v16 )
7742 { 7640 {
7743 LOBYTE(pArcomageGame->stru1.field_8) = 62; 7641 LOBYTE(pArcomageGame->stru1.field_8) = 62;
7744 //goto LABEL_181; 7642 //goto LABEL_181;
7745 if ( wParam == 27 ) 7643 if ( wParam == 27 )
7746 { 7644 {
7756 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7654 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7757 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7655 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7758 //goto _def_wnd_proc; 7656 //goto _def_wnd_proc;
7759 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7657 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7760 } 7658 }
7761 v38 = 0; 7659 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7762 v37 = 103;
7763 //goto LABEL_126;
7764 v36 = 273;
7765 v35 = hWnd;
7766 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7767 return 0; 7660 return 0;
7768 } 7661 }
7769 v17 = v16 - 1; 7662 if ( v13 == 47 )
7770 if ( !v17 )
7771 { 7663 {
7772 LOBYTE(pArcomageGame->stru1.field_8) = 63; 7664 LOBYTE(pArcomageGame->stru1.field_8) = 63;
7773 //goto LABEL_181; 7665 //goto LABEL_181;
7774 if ( wParam == 27 ) 7666 if ( wParam == 27 )
7775 { 7667 {
7785 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7677 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7786 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7678 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7787 //goto _def_wnd_proc; 7679 //goto _def_wnd_proc;
7788 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7680 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7789 } 7681 }
7790 v38 = 0; 7682 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7791 v37 = 103;
7792 //goto LABEL_126;
7793 v36 = 273;
7794 v35 = hWnd;
7795 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7796 return 0; 7683 return 0;
7797 } 7684 }
7798 if ( v17 == 1 ) 7685 if ( v13 == 48 )
7799 { 7686 {
7800 LOBYTE(pArcomageGame->stru1.field_8) = 41; 7687 LOBYTE(pArcomageGame->stru1.field_8) = 41;
7801 //LABEL_181: 7688 //LABEL_181:
7802 if ( wParam == 27 ) 7689 if ( wParam == 27 )
7803 { 7690 {
7813 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7700 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7814 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7701 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7815 //goto _def_wnd_proc; 7702 //goto _def_wnd_proc;
7816 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7703 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7817 } 7704 }
7818 v38 = 0; 7705 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7819 v37 = 103;
7820 //goto LABEL_126;
7821 v36 = 273;
7822 v35 = hWnd;
7823 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7824 return 0; 7706 return 0;
7825 } 7707 }
7826 } 7708 }
7827 } 7709 }
7828 v27 = MapVirtualKeyA((unsigned __int16)wParam, 2u); 7710 v27 = MapVirtualKeyA((unsigned __int16)wParam, 2u);
7843 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() ) 7725 if ( wParam == 115 && !pVideoPlayer->AnyMovieLoaded() )
7844 SendMessageA(hWnd, 0x111u, 0x68u, 0); 7726 SendMessageA(hWnd, 0x111u, 0x68u, 0);
7845 //goto _def_wnd_proc; 7727 //goto _def_wnd_proc;
7846 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7728 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7847 } 7729 }
7848 v38 = 0; 7730 SendMessageA(hWnd, WM_COMMAND, 103, 0);
7849 v37 = 103;
7850 //goto LABEL_126;
7851 v36 = 273;
7852 v35 = hWnd;
7853 SendMessageA(hWnd, WM_COMMAND, v37, v38);
7854 return 0; 7731 return 0;
7855 } 7732 }
7856 if ( Msg == WM_ACTIVATEAPP ) 7733 if ( Msg == WM_ACTIVATEAPP )
7857 { 7734 {
7858 if ( wParam && (GetForegroundWindow() == hWnd || GetForegroundWindow() == hInsertCDWindow) ) 7735 if ( wParam && (GetForegroundWindow() == hWnd || GetForegroundWindow() == hInsertCDWindow) )
9038 dword_6BE364_game_settings_1 |= 0x4000; 8915 dword_6BE364_game_settings_1 |= 0x4000;
9039 8916
9040 switch ( uTurnSpeed ) 8917 switch ( uTurnSpeed )
9041 { 8918 {
9042 case 0: // undefined turn option 8919 case 0: // undefined turn option
9043 //__debugbreak(); // really shouldn't use this mode 8920 __debugbreak(); // really shouldn't use this mode
9044 uTurnSpeed = (unsigned int)uCPUSpeed < 199 ? 128 : 64; // adjust turn speed to estimated fps 8921 uTurnSpeed = (unsigned int)uCPUSpeed < 199 ? 128 : 64; // adjust turn speed to estimated fps
9045 break; 8922 break;
9046 8923
9047 case 1u: // 16x 8924 case 1u: // 16x
9048 Log::Warning(L"x16 Turn Speed"); // really shouldn't use this mode 8925 Log::Warning(L"x16 Turn Speed"); // really shouldn't use this mode