duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made KeyControl.cpp ASM-accurate

Browse source 
Didn't realise this file was so tiny. Anyway, working towards #74.
This commit is contained in:
Clownacy 2019-06-29 21:16:43 +01:00
parent 729540d2b8
commit 2c23de27d5
3 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
msvc2003/devilution/comparer-config.toml
View file

@ -559,6 +559,10 @@ addr = 0x40F330
name = "LoadGenericData" name = "LoadGenericData"
addr = 0x411390 addr = 0x411390
[[func]]
name = "GetTrg"
addr = 0x4122E0
[[func]] [[func]]
name = "InitMapData2" name = "InitMapData2"
addr = 0x413750 addr = 0x413750

5
src/KeyControl.cpp
View file

@ -9,8 +9,10 @@ int gKeyArms = KEY_ARMS;
int gKeyArmsRev = KEY_ARMSREV; int gKeyArmsRev = KEY_ARMSREV;
int gKeyItem = KEY_ITEM; int gKeyItem = KEY_ITEM;
int gKeyMap = KEY_MAP; int gKeyMap = KEY_MAP;
int gKeyOk = KEY_Z; int gKeyOk = KEY_Z;
int gKeyCancel = KEY_X; int gKeyCancel = KEY_X;
int gKeyLeft = KEY_LEFT; int gKeyLeft = KEY_LEFT;
int gKeyUp = KEY_UP; int gKeyUp = KEY_UP;
int gKeyRight = KEY_RIGHT; int gKeyRight = KEY_RIGHT;
@ -19,6 +21,7 @@ int gKeyDown = KEY_DOWN;
void GetTrg() void GetTrg()
{ {
static int key_old; static int key_old;
gKeyTrg = gKey & (gKey ^ key_old); gKeyTrg = gKey ^ key_old;
gKeyTrg = gKey & gKeyTrg;
key_old = gKey; key_old = gKey;
} }

4
src/KeyControl.h
View file

@ -29,7 +29,7 @@ enum KEYBIND
KEY_ALT_DOWN = 0x00020000, KEY_ALT_DOWN = 0x00020000,
KEY_ALT_RIGHT = 0x00040000, KEY_ALT_RIGHT = 0x00040000,
KEY_ALT_UP = 0x00180000, KEY_ALT_UP = 0x00180000,
//Alt up actually has 2 seperate keys, but they're kind of merged together (and also for some reason the second one is +/=) //Alt up actually has 2 seperate keys, but they're kind of merged together
KEY_L = 0x00080000, KEY_L = 0x00080000,
KEY_PLUS = 0x00100000 KEY_PLUS = 0x00100000
}; };
@ -43,8 +43,10 @@ extern int gKeyArms;
extern int gKeyArmsRev; extern int gKeyArmsRev;
extern int gKeyItem; extern int gKeyItem;
extern int gKeyMap; extern int gKeyMap;
extern int gKeyOk; extern int gKeyOk;
extern int gKeyCancel; extern int gKeyCancel;
extern int gKeyLeft; extern int gKeyLeft;
extern int gKeyUp; extern int gKeyUp;
extern int gKeyRight; extern int gKeyRight;