Mercurial > might-and-magic-trilogy
comparison Player.h @ 137:0afe11853c77
Слияние
author | Ritor1 |
---|---|
date | Fri, 16 Nov 2012 18:03:06 +0600 |
parents | acf7f12714a7 |
children | 38a1c8ef6874 |
comparison
equal
deleted
inserted
replaced
136:f07a29f328e8 | 137:0afe11853c77 |
---|---|
384 int field_F4; | 384 int field_F4; |
385 int field_F8; | 385 int field_F8; |
386 int field_FC; | 386 int field_FC; |
387 int field_100; | 387 int field_100; |
388 int field_104; | 388 int field_104; |
389 unsigned __int16 pActiveSkills[37]; | 389 union |
390 { | |
391 struct | |
392 { | |
393 unsigned __int16 skillStaff; | |
394 unsigned __int16 skillSword; | |
395 unsigned __int16 skillDagger; | |
396 unsigned __int16 skillAxe; | |
397 unsigned __int16 skillSpear; | |
398 unsigned __int16 skillBow; | |
399 unsigned __int16 skillMace; | |
400 unsigned __int16 skillBlaster; | |
401 unsigned __int16 skillShield; | |
402 unsigned __int16 skillLeather; | |
403 unsigned __int16 skillChain; | |
404 unsigned __int16 skillPlate; | |
405 unsigned __int16 skillFire; | |
406 unsigned __int16 skillAir; | |
407 unsigned __int16 skillWater; | |
408 unsigned __int16 skillEarth; | |
409 unsigned __int16 skillSpirit; | |
410 unsigned __int16 skillMind; | |
411 unsigned __int16 skillBody; | |
412 unsigned __int16 skillLight; | |
413 unsigned __int16 skillDark; | |
414 unsigned __int16 skillItemId; | |
415 unsigned __int16 skillMerchant; | |
416 unsigned __int16 skillRepair; | |
417 unsigned __int16 skillBodybuilding; | |
418 unsigned __int16 skillMeditation; | |
419 unsigned __int16 skillPerception; | |
420 unsigned __int16 skillDiplomacy; | |
421 unsigned __int16 skillThievery; | |
422 unsigned __int16 skillDisarmTrap; | |
423 unsigned __int16 skillDodge; | |
424 unsigned __int16 skillUnarmed; | |
425 unsigned __int16 skillMonsterId; | |
426 unsigned __int16 skillArmsmaster; | |
427 unsigned __int16 skillStealing; | |
428 unsigned __int16 skillAlchemy; | |
429 unsigned __int16 skillLearning; | |
430 }; | |
431 unsigned __int16 pActiveSkills[37]; | |
432 }; | |
390 char field_152[64]; | 433 char field_152[64]; |
391 PlayerSpells spellbook; | 434 PlayerSpells spellbook; |
392 char field_1F5[30]; // used to be [31] | 435 char field_1F5[30]; // used to be [31] |
393 ItemGen pInventoryItems[126]; | 436 ItemGen pInventoryItems[126]; |
394 ItemGen pEquippedItems[12]; | 437 ItemGen pEquippedItems[12]; |