Mercurial > mm7
diff Arcomage.h @ 1229:eb419a6d48fe
Слияние
author | Ritor1 |
---|---|
date | Sat, 08 Jun 2013 15:45:44 +0600 |
parents | 9baf16113199 |
children | 44f37efc159c 2b950844f2d6 |
line wrap: on
line diff
--- a/Arcomage.h Sat Jun 08 15:45:31 2013 +0600 +++ b/Arcomage.h Sat Jun 08 15:45:44 2013 +0600 @@ -277,22 +277,17 @@ }; #pragma pack(pop) +#define DECK_SIZE 108 -/* 266 */ -//#pragma pack(push, 1) -//struct stru272 -//{ -// void _40DFD1(); -// -// struct stru272_stru0 *ptr_0; -// char field_4[4264]; -//}; -//#pragma pack(pop) +#pragma pack(push, 1) +struct ArcomageDeck + { + char name[32]; + char cardsInUse[DECK_SIZE]; + int cards_IDs[DECK_SIZE]; + }; - - - - +#pragma pack(pop) #pragma pack(push, 1) struct stru272 @@ -302,21 +297,6 @@ char field_2; char field_3; stru272_stru2 field_4; - /*int field_4; - int field_8; - int field_C; - int field_10; - int field_14; - int field_18; - int field_1C; - float field_20f; - int field_24; - float field_28f; - float field_2Cf; - float field_30f; - int field_34; - int field_38; - stru272_stru1* field_3C;*/ stru272_stru0 *field_40; stru272_stru1 field_44[150]; };