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

Pass vobjptridx_t to multi_send_position

Browse source
This commit is contained in:
Kp 2015-05-09 17:38:59 +00:00
parent 9386ac4a24
commit a51a7110e8
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/multi.h
View file

@ -462,7 +462,7 @@ void multi_send_destroy_controlcen(objnum_t objnum, int player);
void multi_send_endlevel_start(int); void multi_send_endlevel_start(int);
void multi_send_player_deres(deres_type_t type); void multi_send_player_deres(deres_type_t type);
void multi_send_message(void); void multi_send_message(void);
void multi_send_position(int objnum); void multi_send_position(vobjptridx_t objnum);
void multi_send_reappear(); void multi_send_reappear();
void multi_send_kill(vobjptridx_t objnum); void multi_send_kill(vobjptridx_t objnum);
void multi_send_remobj(vobjptridx_t objnum); void multi_send_remobj(vobjptridx_t objnum);

7
similar/main/multi.cpp
View file

@ -2769,8 +2769,7 @@ multi_send_reappear()
multi_send_data<MULTI_REAPPEAR>(multibuf, 4, 2); multi_send_data<MULTI_REAPPEAR>(multibuf, 4, 2);
} }
void void multi_send_position(const vobjptridx_t obj)
multi_send_position(int objnum)
{ {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
shortpos sp; shortpos sp;
@ -2780,10 +2779,10 @@ multi_send_position(int objnum)
count++; count++;
multibuf[count++] = (char)Player_num; multibuf[count++] = (char)Player_num;
#ifndef WORDS_BIGENDIAN #ifndef WORDS_BIGENDIAN
create_shortpos((shortpos *)(multibuf+count), &Objects[objnum],0); create_shortpos((shortpos *)(multibuf+count), obj, 0);
count += sizeof(shortpos); count += sizeof(shortpos);
#else #else
create_shortpos(&sp, Objects+objnum, 1); create_shortpos(&sp, obj, 1);
memcpy(&(multibuf[count]), (ubyte *)(sp.bytemat), 9); memcpy(&(multibuf[count]), (ubyte *)(sp.bytemat), 9);
count += 9; count += 9;
memcpy(&(multibuf[count]), (ubyte *)&(sp.xo), 14); memcpy(&(multibuf[count]), (ubyte *)&(sp.xo), 14);