From 39ce1965425d41d3663276280632960359b52301 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Mon, 2 Feb 2009 10:56:12 +0000
Subject: [PATCH] Removed MULIT_POS_* hanldings as these signals are not
 created anymore

---
 CHANGELOG.txt |  1 +
 main/multi.c  | 28 ++--------------------------
 main/multi.h  |  5 +----
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c40ab1878..06450222c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D1X-Rebirth Changelog
 --------
 main/newdemo.c: Defined some default cockpit modes in Demo mode so we do not get invalid values when demo starts in non-default-view mode (as new HUD modes are only triggered at beginning and end of event)
 main/game.c: Made FPS string statically right-justified - unrelated to actual FPS string width preventing jumps
+main/multi.c, main/multi.c: Removed MULIT_POS_* hanldings as these signals are not created anymore
 
 20090201
 --------
diff --git a/main/multi.c b/main/multi.c
index 67b9dd711..191a9f52b 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -1199,13 +1199,6 @@ multi_do_fire(char *buf)
 
 	Assert (pnum < N_players);
 
-//added on 03/05/99 Matt Mueller - add POS_FIRE capability
-    if (buf[0]==MULTI_POS_FIRE)
-	{
-	    extract_shorterpos(&Objects[Players[pnum].objnum],(shorterpos*)(buf+8));
-	}
-//end addition -MM
-
 	if (Objects[Players[pnum].objnum].type == OBJ_GHOST)
 		multi_make_ghost_player(pnum);
 		
@@ -1412,15 +1405,6 @@ multi_do_player_explode(char *buf)
 
 	Net_create_loc = 0;
 
-//added on 03/05/99 Matt Mueller - no more misplaced spew.. might not be the best way to do it though..
-//(moving the player to where they died that is)
-    if (buf[0]==MULTI_POS_PLAYER_EXPLODE)
-	{
-	    extract_shorterpos(objp,(shorterpos*)(buf+message_length[MULTI_PLAYER_EXPLODE]));
-	}
-//end addition -MM
-
-
 	drop_player_eggs(objp);
  
 	// Create mapping from remote to local numbering system
@@ -1443,9 +1427,7 @@ multi_do_player_explode(char *buf)
 		Objects[Net_create_objnums[i]].flags |= OF_SHOULD_BE_DEAD;
 	}
 
-//edited on 03/05/99 Matt Mueller - no more misplaced spew
-	if (buf[0] == MULTI_PLAYER_EXPLODE || buf[0] == MULTI_POS_PLAYER_EXPLODE)
-//end edit -MM
+	if (buf[0] == MULTI_PLAYER_EXPLODE)
 	{
 		explode_badass_player(objp);
 		
@@ -2009,19 +1991,13 @@ multi_process_data(char *buf, int len)
 		case MULTI_REAPPEAR:
 			if (!Endlevel_sequence) multi_do_reappear(buf); break;
 		case MULTI_FIRE:
-	    //added 03/05/99 Matt Mueller - new shorter fire packets
-		case MULTI_POS_FIRE:
-	    //end addition -MM
-                        if (!Endlevel_sequence) multi_do_fire(buf); break;
+			if (!Endlevel_sequence) multi_do_fire(buf); break;
 		case MULTI_KILL:
 			multi_do_kill(buf); break;
 		case MULTI_REMOVE_OBJECT:
 			if (!Endlevel_sequence) multi_do_remobj(buf); break;
 		case MULTI_PLAYER_DROP:
 		case MULTI_PLAYER_EXPLODE:
-	    //added 03/05/99 Matt Mueller - nomore explosions in the wrong place
-		case MULTI_POS_PLAYER_EXPLODE:
-	    //end addition -MM
 			if (!Endlevel_sequence) multi_do_player_explode(buf); break;
 		case MULTI_MESSAGE:
 			if (!Endlevel_sequence) multi_do_message(buf); break;
diff --git a/main/multi.h b/main/multi.h
index 192ebe5cb..ee5b5e99c 100644
--- a/main/multi.h
+++ b/main/multi.h
@@ -100,11 +100,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define MULTI_PLAYER_POWERUP_COUNT	37
 #define MULTI_START_POWERUP_COUNT	38
 
-#define MULTI_POS_FIRE			39
-#define MULTI_POS_PLAYER_EXPLODE	40
-
 #ifndef SHAREWARE
-#define MULTI_MAX_TYPE                  40
+#define MULTI_MAX_TYPE                  38
 #else
 #define MULTI_MAX_TYPE                  25 //22
 #endif