Order things nicely

This commit is contained in:
korenkonder
2024-01-31 12:11:50 +03:00
parent df9ecf7244
commit 735d805ec8
2 changed files with 12 additions and 12 deletions
+11 -11
View File
@@ -22,11 +22,12 @@ static void pvpp_motion_read(string_hash* mot, stream& s);
static void pvpp_object_set_read(string_hash* objset, stream& s);
static void pvpp_read_inner(pvpp* pp, stream& s);
pvpp_chara::pvpp_chara() : chara_effect_init() {
pvpp_chara_effect_auth_3d::pvpp_chara_effect_auth_3d() : has_object_set(),
u00(), u01(), u02(), u03(), u04(), u05(), u06(), u07() {
}
pvpp_chara::~pvpp_chara() {
pvpp_chara_effect_auth_3d::~pvpp_chara_effect_auth_3d() {
}
@@ -38,15 +39,6 @@ pvpp_chara_effect::~pvpp_chara_effect() {
}
pvpp_chara_effect_auth_3d::pvpp_chara_effect_auth_3d() : has_object_set(),
u00(), u01(), u02(), u03(), u04(), u05(), u06(), u07() {
}
pvpp_chara_effect_auth_3d::~pvpp_chara_effect_auth_3d() {
}
pvpp_chara_item::pvpp_chara_item() : type(), u18() {
}
@@ -71,6 +63,14 @@ pvpp_effect::~pvpp_effect() {
}
pvpp_chara::pvpp_chara() : chara_effect_init() {
}
pvpp_chara::~pvpp_chara() {
}
pvpp::pvpp() : ready(), big_endian() {
}
+1 -1
View File
@@ -1464,7 +1464,7 @@ void x_pv_game_chara_effect::load(int32_t pv_id, pvpp* play_param,
#if BAKE_PV826
if (pv_id != 826) {
#endif
if (j.object_set.str.size())
if (j.has_object_set)
object_set.assign(j.object_set.str);
else
object_set.assign(file);