From e1bc0c40eb13884db7a016048ba72f8569802949 Mon Sep 17 00:00:00 2001 From: Alex Sweet Date: Mon, 8 Jul 2019 09:36:04 -0700 Subject: [PATCH] Undo style changes --- structs.h | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/structs.h b/structs.h index b949f8487..051fa76db 100644 --- a/structs.h +++ b/structs.h @@ -1,5 +1,3 @@ -#pragma once - ////////////////////////////////////////////////// // control ////////////////////////////////////////////////// @@ -174,7 +172,7 @@ typedef struct ItemStruct { typedef struct PlayerStruct { int _pmode; char walkpath[25]; - uint8_t plractive; + BOOLEAN plractive; int destAction; int destParam1; int destParam2; @@ -372,8 +370,8 @@ typedef struct TextDataStruct { typedef struct MissileData { unsigned char mName; - void (*mAddProc)(int, int, int, int, int, int, char, int, int); - void (*mProc)(int); + void(* mAddProc)(int, int, int, int, int, int, char, int, int); + void(* mProc)(int); BOOL mDraw; unsigned char mType; unsigned char mResist; @@ -971,6 +969,7 @@ typedef struct TBuffer { ////////////////////////////////////////////////// // quests ////////////////////////////////////////////////// + #pragma pack(push, 4) typedef struct QuestStruct { unsigned char _qlevel; @@ -1009,7 +1008,7 @@ typedef struct QuestData { typedef struct TMenuItem { DWORD dwFlags; char *pszStr; - void (*fnMenu)(BOOL); /* fix, should have one arg */ + void(* fnMenu)(BOOL); /* fix, should have one arg */ } TMenuItem; // TPDEF PTR FCN VOID TMenuUpdateFcn @@ -1321,21 +1320,21 @@ typedef struct _SNETUIDATA { int size; int uiflags; HWND parentwindow; - void (*artcallback)(); - void (*authcallback)(); - void (*createcallback)(); - void (*drawdesccallback)(); - void (*selectedcallback)(); - void (*messageboxcallback)(); - void (*soundcallback)(); - void (*statuscallback)(); - void (*getdatacallback)(); - void (*categorycallback)(); - void (*categorylistcallback)(); - void (*newaccountcallback)(); - void (*profilecallback)(); + void(* artcallback)(); + void(* authcallback)(); + void(* createcallback)(); + void(* drawdesccallback)(); + void(* selectedcallback)(); + void(* messageboxcallback)(); + void(* soundcallback)(); + void(* statuscallback)(); + void(* getdatacallback)(); + void(* categorycallback)(); + void(* categorylistcallback)(); + void(* newaccountcallback)(); + void(* profilecallback)(); int profilefields; - void (*profilebitmapcallback)(); + void(* profilebitmapcallback)(); int(__stdcall *selectnamecallback)( const struct _SNETPROGRAMDATA *, const struct _SNETPLAYERDATA *, @@ -1345,8 +1344,8 @@ typedef struct _SNETUIDATA { char *, DWORD, /* character name will be copied here */ char *, DWORD, /* character "description" will be copied here (used to advertise games) */ BOOL * /* new character? - unsure about this */ - ); - void (*changenamecallback)(); + ); + void(* changenamecallback)(); } _SNETUIDATA; typedef struct _SNETVERSIONDATA {