TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Avoid memcpy on object

Browse source
This commit is contained in:
Kp 2013-12-12 21:53:23 +00:00
parent 9776827a33
commit 76b4a6c57e
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
similar/main/newdemo.cpp
View file

@ -3281,14 +3281,7 @@ static void interpolate_frame(fix d_play, fix d_recorded)
factor = F1_0;
num_cur_objs = Highest_object_index;
RAIIdmem<object> cur_objs;
MALLOC(cur_objs, object, (num_cur_objs + 1));
if (cur_objs == NULL) {
Int3();
return;
}
for (i = 0; i <= num_cur_objs; i++)
memcpy(&(cur_objs[i]), &(Objects[i]), sizeof(object));
std::vector<object> cur_objs(Objects.begin(), Objects.begin() + num_cur_objs + 1);
Newdemo_vcr_state = ND_STATE_PAUSED;
if (newdemo_read_frame_information(0) == -1) {
@ -3363,8 +3356,7 @@ static void interpolate_frame(fix d_play, fix d_recorded)
newdemo_stop_playback();
Newdemo_vcr_state = ND_STATE_PLAYBACK;
for (i = 0; i <= num_cur_objs; i++)
memcpy(&(Objects[i]), &(cur_objs[i]), sizeof(object));
std::copy(cur_objs.begin(), cur_objs.begin() + num_cur_objs + 1, Objects.begin());
Highest_object_index = num_cur_objs;
}
@ -3487,14 +3479,7 @@ void newdemo_playback_one_frame()
int i, j, num_objs, level;
num_objs = Highest_object_index;
RAIIdmem<object> cur_objs;
MALLOC(cur_objs, object, (num_objs + 1));
if (cur_objs == NULL) {
Warning ("Couldn't get %lu bytes for objects in interpolate playback\n", (unsigned long)sizeof(object) * num_objs);
break;
}
for (i = 0; i <= num_objs; i++)
memcpy(&(cur_objs[i]), &(Objects[i]), sizeof(object));
std::vector<object> cur_objs(Objects.begin(), Objects.begin() + num_objs + 1);
level = Current_level_num;
if (newdemo_read_frame_information(0) == -1) {
@ -3989,11 +3974,11 @@ static void nd_render_extras (ubyte which,object *obj)
if (w)
{
memcpy (&DemoRightExtra,obj,sizeof(object)); DemoDoRight=type;
DemoRightExtra = *obj; DemoDoRight=type;
}
else
{
memcpy (&DemoLeftExtra,obj,sizeof(object)); DemoDoLeft=type;
DemoLeftExtra = *obj; DemoDoLeft=type;
}
}

2
similar/main/state.cpp
View file

@ -1833,7 +1833,7 @@ int state_restore_all_sub(const char *filename, int secret_restore)
obj = &Objects[restore_players[i].objnum];
if (restore_players[i].connected == CONNECT_PLAYING && obj->type == OBJ_PLAYER)
{
memcpy(&restore_objects[i], obj, sizeof(object));
restore_objects[i] = *obj;
obj->type = OBJ_GHOST;
multi_reset_player_object(obj);
}