Ticket #8641: fix_mh1_mh2.patch
File fix_mh1_mh2.patch, 2.9 KB (added by , 17 years ago) |
---|
-
agi.h
109 109 GF_AGI256_2 = (1 << 3), 110 110 GF_AGIPAL = (1 << 4), 111 111 GF_MACGOLDRUSH = (1 << 5), 112 GF_FANMADE = (1 << 6) 112 GF_FANMADE = (1 << 6), 113 GF_ESC_MENU = (1 << 7), 114 GF_MANHUNTER = (1 << 8) 113 115 }; 114 116 115 117 struct AGIGameDescription; -
detection.cpp
513 513 Common::ADGF_NO_FLAGS 514 514 }, 515 515 GType_V2, 516 0,516 GF_ESC_MENU, 517 517 0x2917, 518 518 }, 519 519 … … 529 529 Common::ADGF_NO_FLAGS 530 530 }, 531 531 GType_V2, 532 0,532 GF_ESC_MENU, 533 533 0x2440, 534 534 }, 535 535 … … 545 545 Common::ADGF_NO_FLAGS 546 546 }, 547 547 GType_V2, 548 0,548 GF_ESC_MENU, 549 549 0x2440, 550 550 }, 551 551 … … 561 561 Common::ADGF_NO_FLAGS 562 562 }, 563 563 GType_V2, 564 0,564 GF_ESC_MENU, 565 565 0x2440, // XXX: any major differences from 2.411 to 2.440? 566 566 }, 567 567 … … 577 577 Common::ADGF_NO_FLAGS 578 578 }, 579 579 GType_V2, 580 0,580 GF_ESC_MENU, 581 581 0x2917, 582 582 }, 583 583 … … 897 897 Common::ADGF_NO_FLAGS 898 898 }, 899 899 GType_V3, 900 0,900 GF_MANHUNTER, 901 901 0x3149, 902 902 }, 903 903 … … 913 913 Common::ADGF_NO_FLAGS 914 914 }, 915 915 GType_V3, 916 0,916 GF_MANHUNTER, 917 917 0x3149, 918 918 }, 919 919 … … 929 929 Common::ADGF_NO_FLAGS 930 930 }, 931 931 GType_V3, 932 0,932 GF_MANHUNTER, 933 933 0x3149, 934 934 }, 935 935 … … 946 946 Common::ADGF_NO_FLAGS 947 947 }, 948 948 GType_V3, 949 0,949 GF_MANHUNTER, 950 950 0x3149, 951 951 }, 952 952 … … 962 962 Common::ADGF_NO_FLAGS 963 963 }, 964 964 GType_V3, 965 0,965 GF_MANHUNTER, 966 966 0x3149, 967 967 }, 968 968 … … 978 978 Common::ADGF_NO_FLAGS 979 979 }, 980 980 GType_V3, 981 0,981 GF_MANHUNTER, 982 982 0x3149, 983 983 }, 984 984 … … 994 994 Common::ADGF_NO_FLAGS 995 995 }, 996 996 GType_V3, 997 0,997 GF_MANHUNTER, 998 998 0x3086, 999 999 }, 1000 1000 … … 1010 1010 Common::ADGF_NO_FLAGS 1011 1011 }, 1012 1012 GType_V3, 1013 0,1013 GF_MANHUNTER, 1014 1014 0x3149, 1015 1015 }, 1016 1016 … … 1026 1026 Common::ADGF_NO_FLAGS 1027 1027 }, 1028 1028 GType_V3, 1029 0,1029 GF_MANHUNTER, 1030 1030 0x3149, 1031 1031 }, 1032 1032 -
keyboard.cpp
92 92 /* If a key is ready, rip it */ 93 93 if (_gfx->keypress()) { 94 94 key = _gfx->getKey(); 95 if ( (getFeatures() & GF_MANHUNTER) && (key == KEY_ENTER) && (_game.inputMode == INPUT_NONE) ) 96 key = 0x20; /* Set Enter key to Space in Manhunter when there's no text input */ 95 97 debugC(3, kDebugLevelInput, "key %02x pressed", key); 96 98 } 97 98 99 return key; 99 100 } 100 101 … … 102 103 VtEntry *v = &_game.viewTable[0]; 103 104 int i; 104 105 105 /* The Black Cauldron needsKEY_ESCAPE to use menus */106 if (key == 0 /*|| key == KEY_ESCAPE */)106 /* AGI 3.149 games need KEY_ESCAPE to use menus */ 107 if (key == 0 || (key == KEY_ESCAPE && (getFeatures() & GF_ESC_MENU)) ) 107 108 return false; 108 109 109 110 debugC(3, kDebugLevelInput, "key = %04x", key);