Changeset 1161 for Daodan/src/Patches

Timestamp:

Oct 24, 2021, 4:50:22 AM (3 years ago)

Author:

rossy

Message:

Daodan: Use uint64_t for Oni's action state

Location:

Daodan/src/Patches

Files:

• BSL.c (modified) (9 diffs)
• Utility.c (modified) (1 diff)

Daodan/src/Patches/BSL.c

@@ -431 +431 @@
 typedef struct {
 char Name[16];
-int Bit;
+uint64_t Bit;
 } KeyBit;
 
-KeyBit Actions1[32] = {
+static KeyBit Actions[] = {
         {"Escape", Action_Escape},
         {"Console", Action_Console},
@@ -445 +445 @@
         {"F7", Action_F7                        },
         {"F8", Action_F8                        },
-        {"StartRecord", Action_StartRecord        },       
-        {"StopRecord", Action_StopRecord            },    
-        {"PlayRecord", Action_PlayRecord              },  
+        {"StartRecord", Action_StartRecord        },
+        {"StopRecord", Action_StopRecord            },
+        {"PlayRecord", Action_PlayRecord              },
         {"F12", Action_F12                       },
-        {"Unknown1", Action_Unknown1               },  
         {"LookMode", Action_LookMode           },
-        {"Screenshot", Action_Screenshot         },     
-        {"Unknown2", Action_Unknown2              },
-        {"Unknown3", Action_Unknown3              },   
-        {"Unknown4", Action_Unknown4                },
-        {"Unknown5", Action_Unknown5                },
+        {"Screenshot", Action_Screenshot         },
         {"Forward", Action_Forward                 },
         {"Backward", Action_Backward                },
@@ -466 +461 @@
         {"Punch",Action_Punch                   },
         {"Kick", Action_Kick                    },
-        {"Block", Action_Block                   }
+        {"Block", Action_Block                   },
+        {"Walk", Action_Walk},
+        {"Action", Action_Action},
+        {"Hypo", Action_Hypo},
+        {"Reload", Action_Reload                },
+        {"Swap", Action_Swap                },
+        {"Drop", Action_Drop                     },
+        {"Fire1", Action_Fire1                       },
+        {"Fire2", Action_Fire2                       },
+        {"Fire3", Action_Fire3                       }
 };
 
-KeyBit Actions2[9] = {
-        {"Walk", Action2_Walk},
-        {"Action", Action2_Action},
-        {"Hypo", Action2_Hypo},
-        {"Reload", Action2_Reload                },
-        {"Swap", Action2_Swap                },
-        {"Drop", Action2_Drop                     },
-        {"Fire1", Action2_Fire1                       },
-        {"Fire2", Action2_Fire2                       },
-        {"Fire3", Action2_Fire3                       }
-};
 uint16_t ONICALL bsl_holdkey(sl_callinfo* callinfo, uint32_t numargs, sl_arg args[], int* dontuse1, int* dontuse2, sl_arg* ret)
 {
@@ -485 +478 @@
         uint32_t i = 2;
         uint32_t j = 0;
-        int Input1 = 0;
-        int Input2 = 0;
+        uint64_t Input = 0;
         Character* Chr;
         ActiveCharacter* Active;
@@ -498 +490 @@
         for(i = 1; i < numargs - 1; i++) {
                 for(j = 0; j < 32; j++) {
-                        if(!strcmp(args[i].val.value_str32, Actions1[j].Name)) {
-                                Input1 = Input1 | Actions1[j].Bit;
+                        if(!strcmp(args[i].val.value_str32, Actions[j].Name)) {
+                                Input = Input | Actions[j].Bit;
                         }
                 }
-                for(j = 0; j < 9; j++) {
-                        if(!strcmp(args[i].val.value_str32, Actions2[j].Name)) { 
-                                Input2 = Input2 | Actions2[j].Bit;
-                        }
-                }
-        }
-        Active->Input.Current.Actions1 = Active->Input.Current.Actions1 | Input1;
-        Active->Input.Current.Actions2 = Active->Input.Current.Actions2 | Input2;
-        if( Input1 + Input2 == 0 ) {
+        }
+        Active->Input.ActionsDown = Active->Input.ActionsDown | Input;
+        if( Input == 0 ) {
                 DDrConsole_PrintF("Func \"%s\", File \"%s\", Line %d: semantic error, \"%s\": No valid keys given.", callinfo->name, callinfo->calllocation, callinfo->linenumber, callinfo->name);
                 return 0;
@@ -537 +523 @@
         uint32_t i = 2;
         uint32_t j = 0;
-        int Input1 = 0;
-        int Input2 = 0;
+        uint64_t Input = 0;
         for(i = 0; i < numargs; i++) {
                 for(j = 0; j < 32; j++) {
                         //DDrConsole_PrintF("Testing %s against %s 0x%x", args[i].val.value_str32, Actions1[j].Name, Actions1[j].Bit);
-                        if(!strcmp(args[i].val.value_str32, Actions1[j].Name)) {
-                                Input1 = Input1 | Actions1[j].Bit;
+                        if(!strcmp(args[i].val.value_str32, Actions[j].Name)) {
+                                Input = Input | Actions[j].Bit;
                                 //DDrConsole_PrintF("Success!");
                         }
-                        
-                }
-                for(j = 0; j < 9; j++) {
-                        if(!strcmp(args[i].val.value_str32, Actions2[j].Name)) Input2 = Input2 | Actions2[j].Bit;
-        
+
                 }
                 }
@@ -556 +537 @@
         ret->val.value_int32 = 0;
         ret->type = sl_int32;
-        if ( (ONgGameState->Input.Current.Actions1 == Input1)  && (ONgGameState->Input.Current.Actions2 == Input2)) ret->val.value_int32 = 1;
+        if (ONgGameState->Input.ActionsDown == Input) ret->val.value_int32 = 1;
         return 0;
 }
@@ -573 +554 @@
         int i = 2;
         int j = 0;
-        int Input1 = 0;
-        int Input2 = 0;
+        uint64_t Input = 0;
 /*
         numargs = 0;
@@ -589 +569 @@
                 for(j = 0; j < 32; j++) {
                         //DDrConsole_PrintF("Testing %s against %s 0x%x", args[i].val.value_str32, Actions1[j].Name, Actions1[j].Bit);
-                        if(!strcmp(args[i].val.value_str32, Actions1[j].Name)) {
-                                Input1 = Input1 | Actions1[j].Bit;
+                        if(!strcmp(args[i].val.value_str32, Actions[j].Name)) {
+                                Input = Input | Actions[j].Bit;
                                 //DDrConsole_PrintF("Success!");
                         }
-                        
-                }
-                for(j = 0; j < 9; j++) {
-                        if(!strcmp(args[i].val.value_str32, Actions2[j].Name)) Input2 = Input2 | Actions2[j].Bit;
-        
+
                 }
         //      }
         DDrConsole_PrintF("Waiting...");
-        if ( 
-                (( ONgGameState->Input.Current.Actions1 & Input1) == Input1)  && 
-                (( ONgGameState->Input.Current.Actions2 & Input2) == Input2) 
-        )
+        if (( ONgGameState->Input.ActionsDown & Input) == Input)
         {
         DDrConsole_PrintF("Found key!");

Daodan/src/Patches/Utility.c

@@ -122 +122 @@
         COtTextArea* cons = *(COtTextArea**)0x00571B74;
         char* clipboardText = 0;
-        if(ONgGameState->Input.Current.Actions1 & Action_Console && GetKeyState(0x56) & 0x80 && GetKeyState(VK_CONTROL) & 0x80 )
+        if(ONgGameState->Input.ActionsDown & Action_Console && GetKeyState(0x56) & 0x80 && GetKeyState(VK_CONTROL) & 0x80 )
         {
                 if(cons && cons->text_entries && cons->num_text_entries)