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

Fixed uninitialized bytes in multi_do_create_robot_powerups() and two set but unused variables

Browse source
This commit is contained in:
zicodxx 2011-07-12 15:34:42 +02:00
parent 149bd7ad7c
commit 9726c06b6a
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -3,6 +3,7 @@ D2X-Rebirth Changelog
20110712 20110712
-------- --------
main/wall.c: Readded automatic wall-flag setting for opened doors as PLP cannot protect us from negative side-effects due to how gullible multi_do_door_open() works main/wall.c: Readded automatic wall-flag setting for opened doors as PLP cannot protect us from negative side-effects due to how gullible multi_do_door_open() works
main/multibot.c: Fixed uninitialized bytes in multi_do_create_robot_powerups() and two set but unused variables
20110710 20110710
-------- --------

18
main/multibot.c
View file

@ -765,11 +765,11 @@ multi_do_robot_fire(char *buf)
int loc = 1; int loc = 1;
int botnum; int botnum;
short remote_botnum; short remote_botnum;
int pnum, gun_num; int gun_num;
vms_vector fire, gun_point; vms_vector fire, gun_point;
robot_info *robptr; robot_info *robptr;
pnum = buf[loc]; loc += 1; loc += 1; // pnum
remote_botnum = GET_INTEL_SHORT(buf + loc); remote_botnum = GET_INTEL_SHORT(buf + loc);
botnum = objnum_remote_to_local(remote_botnum, (sbyte)buf[loc+2]); loc += 3; botnum = objnum_remote_to_local(remote_botnum, (sbyte)buf[loc+2]); loc += 3;
gun_num = (sbyte)buf[loc]; loc += 1; gun_num = (sbyte)buf[loc]; loc += 1;
@ -882,11 +882,10 @@ multi_do_robot_explode(char *buf)
short remote_botnum; short remote_botnum;
int loc = 1; int loc = 1;
short killer, remote_killer; short killer, remote_killer;
int pnum;
int rval; int rval;
char thief; char thief;
pnum = buf[loc]; loc += 1; loc += 1; // pnum
remote_killer = GET_INTEL_SHORT(buf + loc); remote_killer = GET_INTEL_SHORT(buf + loc);
killer = objnum_remote_to_local(remote_killer, (sbyte)buf[loc+2]); loc += 3; killer = objnum_remote_to_local(remote_killer, (sbyte)buf[loc+2]); loc += 3;
remote_botnum = GET_INTEL_SHORT(buf + loc); remote_botnum = GET_INTEL_SHORT(buf + loc);
@ -1072,10 +1071,13 @@ multi_do_create_robot_powerups(char *buf)
object del_obj; object del_obj;
int pnum, egg_objnum, i; int pnum, egg_objnum, i;
pnum = buf[loc]; loc += 1; memset( &del_obj, 0, sizeof(object) );
del_obj.contains_count = buf[loc]; loc += 1; del_obj.type = OBJ_ROBOT;
del_obj.contains_type = buf[loc]; loc += 1;
del_obj.contains_id = buf[loc]; loc += 1; pnum = buf[loc]; loc += 1;
del_obj.contains_count = buf[loc]; loc += 1;
del_obj.contains_type = buf[loc]; loc += 1;
del_obj.contains_id = buf[loc]; loc += 1;
del_obj.segnum = GET_INTEL_SHORT(buf + loc); loc += 2; del_obj.segnum = GET_INTEL_SHORT(buf + loc); loc += 2;
memcpy(&del_obj.pos, buf+loc, sizeof(vms_vector)); loc += 12; memcpy(&del_obj.pos, buf+loc, sizeof(vms_vector)); loc += 12;