ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/Daodan/src/Oni_Character.h
(Generate patch)

Comparing Daodan/src/Oni_Character.h (file contents):
Revision 470 by gumby, Mon Oct 26 07:58:02 2009 UTC vs.
Revision 473 by gumby, Fri Oct 30 07:41:39 2009 UTC

# Line 2 | Line 2
2   #ifndef ONI_CHARACTER_H
3   #define ONI_CHARACTER_H
4  
5 < #include "Daodan.h"
5 > #include "Oni.h"
6   #include <stdint.h>
7   #include <stdbool.h>
8  
# Line 300 | Line 300 | typedef struct { //ActiveCharacter
300          int32_t field_1AAC;
301          int32_t Executor_HasFacingOverride; //a bool...
302          float   Executor_AimingSpeed;
303 <        bool    field_1AB8; //actually a bitset...
304 <        bool    Executor_HasMoveOverride;
303 >        onibool field_1AB8; //actually a bitset...
304 >        onibool Executor_HasMoveOverride;
305          int16_t field_1ABA;
306          int32_t field_1ABC;
307          int32_t field_1AC0;
# Line 362 | Line 362 | typedef struct { //ActiveCharacter
362          int16_t field_1CA6; //spacing
363          AttachedParticle AnimationAttachedParticles[16];
364          int32_t TRAMParticles;
365 <        bool FixedParticlesAttached;
366 <        bool FixedParticlesStarted;
365 >        onibool FixedParticlesAttached;
366 >        onibool FixedParticlesStarted;
367          int16_t NumFixedParticles;
368          AttachedParticle FixedParticles[16];
369          int16_t CurrentAnimationType;
# Line 399 | Line 399 | typedef struct { //ActiveCharacter
399          int32_t field_21C8;
400          int32_t field_21D0;
401          int32_t field_21D4;
402 <        bool field_21D8;
403 <        bool field_21D9;
404 <        bool field_21DA;
405 <        bool field_21DB;
406 <        bool field_21DC;
407 <        bool field_21DD;
408 <        bool field_21DE;
409 <        bool field_21DF;
410 <        bool field_21E0;
411 <        bool HasAlternateTrigger;
412 <        bool field_21E2;
413 <        bool ReleaseTrigger;
414 <        bool ReleaseAlternateTrigger;
415 <        bool TurningLeft;
416 <        bool TurningRight;
417 <        bool field_21E7;
402 >        onibool field_21D8;
403 >        onibool field_21D9;
404 >        onibool field_21DA;
405 >        onibool field_21DB;
406 >        onibool field_21DC;
407 >        onibool field_21DD;
408 >        onibool field_21DE;
409 >        onibool field_21DF;
410 >        onibool field_21E0;
411 >        onibool HasAlternateTrigger;
412 >        onibool field_21E2;
413 >        onibool ReleaseTrigger;
414 >        onibool ReleaseAlternateTrigger;
415 >        onibool TurningLeft;
416 >        onibool TurningRight;
417 >        onibool field_21E7;
418          int32_t field_21E8;
419          int32_t field_21EC;
420          int32_t field_21F0;
# Line 426 | Line 426 | typedef struct { //ActiveCharacter
426          int16_t ShadowIndex;
427          int16_t field_27FE;
428          int16_t field_2780;
429 <        bool ShieldParts[19];
430 <        bool field_2815; //padding...
431 <        bool field_2816;
432 <        bool field_2817;
429 >        onibool ShieldParts[19];
430 >        onibool field_2815; //padding...
431 >        onibool field_2816;
432 >        onibool field_2817;
433          int32_t field_2818[8];
434   } ActiveCharacter;
435  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)