diff --git a/common/main/automap.h b/common/main/automap.h index dfa46ff87..f80d90f6a 100644 --- a/common/main/automap.h +++ b/common/main/automap.h @@ -53,7 +53,6 @@ int MarkerInputMessage(int key); extern char MarkerMessage[NUM_MARKERS][MARKER_MESSAGE_LEN]; extern int MarkerObject[NUM_MARKERS]; -extern vms_vector MarkerPoint[NUM_MARKERS]; extern ubyte DefiningMarkerMessage; #endif diff --git a/similar/main/automap.cpp b/similar/main/automap.cpp index 89354140f..4dbf524ae 100644 --- a/similar/main/automap.cpp +++ b/similar/main/automap.cpp @@ -203,7 +203,6 @@ static void automap_build_edge_list(automap *am, int add_all_edges); #define MAX_DROP_SINGLE 9 #if defined(DXX_BUILD_DESCENT_II) -vms_vector MarkerPoint[NUM_MARKERS]; //these are only used in multi.c, and I'd get rid of them there, but when I tried to do that once, I caused some horrible bug. -MT int HighlightMarker=-1; char MarkerMessage[NUM_MARKERS][MARKER_MESSAGE_LEN]; float MarkerScale=2.0; @@ -293,8 +292,6 @@ static void DropMarker (int player_marker_num) int marker_num = (Player_num*2)+player_marker_num; object *playerp = &Objects[Players[Player_num].objnum]; - MarkerPoint[marker_num] = playerp->pos; - if (MarkerObject[marker_num] != object_none) obj_delete(MarkerObject[marker_num]); @@ -316,8 +313,6 @@ void DropBuddyMarker(object *objp) sprintf(MarkerMessage[marker_num], "RIP: %s",PlayerCfg.GuidebotName); - MarkerPoint[marker_num] = objp->pos; - if (MarkerObject[marker_num] != object_none && MarkerObject[marker_num] !=0) obj_delete(MarkerObject[marker_num]); diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 95b2ff5ae..3f72e71a0 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -2322,8 +2322,6 @@ static void multi_do_drop_marker (const ubyte *buf) for (i=0;i<40;i++) MarkerMessage[(pnum*2)+mesnum][i]=buf[15+i]; - MarkerPoint[(pnum*2)+mesnum]=position; - if (MarkerObject[(pnum*2)+mesnum] !=object_none && Objects[MarkerObject[(pnum*2)+mesnum]].type!=OBJ_NONE && MarkerObject[(pnum*2)+mesnum] !=0) obj_delete(MarkerObject[(pnum*2)+mesnum]); @@ -2564,10 +2562,13 @@ void multi_send_markers() for (i = 0; i < N_players; i++) { - if (MarkerObject[(i*2)]!=object_none) - multi_send_drop_marker (i,MarkerPoint[(i*2)],0,MarkerMessage[i*2]); - if (MarkerObject[(i*2)+1]!=object_none) - multi_send_drop_marker (i,MarkerPoint[(i*2)+1],1,MarkerMessage[(i*2)+1]); + int mo; + mo = MarkerObject[(i*2)]; + if (mo!=object_none) + multi_send_drop_marker (i,Objects[mo].pos,0,MarkerMessage[i*2]); + mo = MarkerObject[(i*2)+1]; + if (mo!=object_none) + multi_send_drop_marker (i,Objects[mo].pos,1,MarkerMessage[(i*2)+1]); } } #endif