gamebase mmebervar cleanups. mPacked in particular is likely to geta followup for other cleaning.

This commit is contained in:
Azaezel 2018-03-28 23:41:47 -05:00
parent 317cd9151a
commit 7064b41506
18 changed files with 38 additions and 38 deletions

View file

@ -184,7 +184,7 @@ void afxEffectGroupData::packData(BitStream* stream)
stream->write(timing.fade_in_time);
stream->write(timing.fade_out_time);
pack_fx(stream, fx_list, packed);
pack_fx(stream, fx_list, mPacked);
}
void afxEffectGroupData::unpackData(BitStream* stream)

View file

@ -380,7 +380,7 @@ void afxEffectWrapperData::packData(BitStream* stream)
{
Parent::packData(stream);
writeDatablockID(stream, effect_data, packed);
writeDatablockID(stream, effect_data, mPacked);
stream->writeString(effect_name);
@ -419,7 +419,7 @@ void afxEffectWrapperData::packData(BitStream* stream)
stream->write(scale_factor);
// modifiers
pack_mods(stream, xfm_modifiers, packed);
pack_mods(stream, xfm_modifiers, mPacked);
mathWrite(*stream, forced_bbox);
stream->write(update_forced_bbox);

View file

@ -157,7 +157,7 @@ void afxEffectronData::packData(BitStream* stream)
stream->write(duration);
stream->write(n_loops);
pack_fx(stream, fx_list, packed);
pack_fx(stream, fx_list, mPacked);
}
void afxEffectronData::unpackData(BitStream* stream)

View file

@ -326,15 +326,15 @@ void afxMagicSpellData::packData(BitStream* stream)
stream->writeFlag(do_move_interrupts);
stream->write(move_interrupt_speed);
writeDatablockID(stream, missile_db, packed);
writeDatablockID(stream, missile_db, mPacked);
stream->write(launch_on_server_signal);
stream->write(primary_target_types);
pack_fx(stream, casting_fx_list, packed);
pack_fx(stream, launch_fx_list, packed);
pack_fx(stream, delivery_fx_list, packed);
pack_fx(stream, impact_fx_list, packed);
pack_fx(stream, linger_fx_list, packed);
pack_fx(stream, casting_fx_list, mPacked);
pack_fx(stream, launch_fx_list, mPacked);
pack_fx(stream, delivery_fx_list, mPacked);
pack_fx(stream, impact_fx_list, mPacked);
pack_fx(stream, linger_fx_list, mPacked);
}
void afxMagicSpellData::unpackData(BitStream* stream)

View file

@ -230,9 +230,9 @@ void afxSelectronData::packData(BitStream* stream)
stream->write(obj_type_style);
stream->write(obj_type_mask);
pack_fx(stream, main_fx_list, packed);
pack_fx(stream, select_fx_list, packed);
pack_fx(stream, deselect_fx_list, packed);
pack_fx(stream, main_fx_list, mPacked);
pack_fx(stream, select_fx_list, mPacked);
pack_fx(stream, deselect_fx_list, mPacked);
}
void afxSelectronData::unpackData(BitStream* stream)

View file

@ -116,7 +116,7 @@ void afxSpellBookData::packData(BitStream* stream)
stream->write(pages_per_book);
for (S32 i = 0; i < pages_per_book*spells_per_page; i++)
writeDatablockID(stream, rpg_spells[i], packed);
writeDatablockID(stream, rpg_spells[i], mPacked);
}
void afxSpellBookData::unpackData(BitStream* stream)

View file

@ -176,8 +176,8 @@ void afxT3DLightBaseData::packData(BitStream* stream)
stream->write( mAnimState.animationPhase );
stream->write( mFlareScale );
writeDatablockID(stream, mAnimationData, packed);
writeDatablockID(stream, mFlareData, packed);
writeDatablockID(stream, mAnimationData, mPacked);
writeDatablockID(stream, mFlareData, mPacked);
}
void afxT3DLightBaseData::unpackData(BitStream* stream)

View file

@ -235,7 +235,7 @@ void afxPhraseEffectData::packData(BitStream* stream)
stream->writeString(on_trig_cmd);
pack_fx(stream, fx_list, packed);
pack_fx(stream, fx_list, mPacked);
}
void afxPhraseEffectData::unpackData(BitStream* stream)