diff options
author | Peter Schlaile <peter@schlaile.de> | 2006-05-06 19:26:53 +0400 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2006-05-06 19:26:53 +0400 |
commit | 5f571e4ded613ac46242affa2cea90135077d323 (patch) | |
tree | f80ebe58bab5a7f74634676e1f4cf93861baafa2 /source/blender/makesdna/DNA_actuator_types.h | |
parent | 5a9b917ea4056694d31b61a185d859ce368e968c (diff) |
==Bugfix==
Made the frame boost from short to int (30000 -> 300000 frames) complete
by walking through the source and finally changing all frame-variables
to ints.
This should finally fix the framecounter warp around seen in some buttons.
If you step on any further problems that may arise starting from frame
32768 please just give me a hint and I'll fix it.
(Sorry about that, didn't know enough about Blender, when I did it the first
time...)
Diffstat (limited to 'source/blender/makesdna/DNA_actuator_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 7bb367cc244..410ca665731 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -50,28 +50,26 @@ typedef struct bAddObjectActuator { typedef struct bActionActuator { struct bAction *act; /* Pointer to action */ short type, flag; /* Playback type */ - short sta, end; /* Start & End frames */ + int sta, end; /* Start & End frames */ char name[32]; /* For property-driven playback */ - short blendin; /* Number of frames of blending */ + int blendin; /* Number of frames of blending */ short priority; /* Execution priority */ - float stridelength; /* Displacement incurred by cycle */ short strideaxis; /* Displacement axis */ - short reserved1; /* Padding */ - short reserved2; /* Padding */ - short reserved3; /* Padding */ + float stridelength; /* Displacement incurred by cycle */ } bActionActuator; typedef struct bSoundActuator { short flag, sndnr; - short sta, end; + int sta, end; + short pad1[2]; struct bSound *sound; short type, makecopy; - short copymade, pad[1]; + short copymade, pad2[1]; } bSoundActuator; typedef struct bCDActuator { short flag, sndnr; - short sta, end; + int sta, end; short type, track; float volume; } bCDActuator; @@ -112,7 +110,7 @@ typedef struct bObjectActuator { typedef struct bIpoActuator { short flag, type; - short sta, end; + int sta, end; char name[32]; short pad1, cur, butsta, butend; @@ -136,10 +134,10 @@ typedef struct bConstraintActuator { typedef struct bGroupActuator { short flag, type; - short sta, end; + int sta, end; char name[32]; /* property or groupkey */ - short pad1, cur, butsta, butend; + short pad[3], cur, butsta, butend;/* not referenced, can remove? */ struct Group *group; /* only during game */ } bGroupActuator; @@ -185,7 +183,7 @@ typedef struct bMessageActuator { typedef struct bGameActuator { short flag, type; - short sta, end; + int sta, end; char filename[64]; char loadaniname[64]; } bGameActuator; |