Merge branch 'master' of https://github.com/coelckers/gzdoom

src/d_net.cpp

@@ -2667,12 +2667,13 @@ void Net_DoCommand (int type, BYTE **stream, int player)
 
 	case DEM_NETEVENT:
 		{
-			FString ename = ReadString(stream);
+			const char *ename = ReadString(stream);
 			int argn = ReadByte(stream);
 			int arg[3] = { 0, 0, 0 };
-			for (int i = 0; i < argn; i++)
+			for (int i = 0; i < 3; i++)
 				arg[i] = ReadLong(stream);
 			E_Console(player, ename, arg[0], arg[1], arg[2]);
+			delete[] ename;
 		}
 		break;
 
@@ -2722,6 +2723,10 @@ void Net_SkipCommand (int type, BYTE **stream)
 			skip = strlen ((char *)(*stream)) + 5;
 			break;
 
+		case DEM_NETEVENT:
+			skip = strlen((char *)(*stream)) + 13;
+			break;
+
 		case DEM_SUMMON2:
 		case DEM_SUMMONFRIEND2:
 		case DEM_SUMMONFOE2:

src/events.cpp

@@ -1139,7 +1139,7 @@ CCMD(netevent)
 		Net_WriteByte(DEM_NETEVENT);
 		Net_WriteString(argv[1]);
 		Net_WriteByte(argn);
-		for (int i = 0; i < argn; i++)
+		for (int i = 0; i < 3; i++)
 			Net_WriteLong(arg[i]);
 	}
 }

src/gl/data/gl_data.cpp

@@ -109,6 +109,7 @@ void AdjustSpriteOffsets()
 		{
 			char str[9];
 			Wads.GetLumpName(str, i);
+			str[8] = 0;
 			FTextureID texid = TexMan.CheckForTexture(str, FTexture::TEX_Sprite, 0);
 			if (texid.isValid() && Wads.GetLumpFile(TexMan[texid]->SourceLump) > FWadCollection::IWAD_FILENUM)
 			{

src/p_mobj.cpp

@@ -903,7 +903,7 @@ bool AActor::TakeInventory(PClassActor *itemclass, int amount, bool fromdecorate
 	// Do not take ammo if the "no take infinite/take as ammo depletion" flag is set
 	// and infinite ammo is on
 	if (notakeinfinite &&
-	((dmflags & DF_INFINITE_AMMO) || (player && FindInventory(NAME_PowerInfiniteAmmo))) && item->IsKindOf(NAME_Ammo))
+	((dmflags & DF_INFINITE_AMMO) || (player && FindInventory(NAME_PowerInfiniteAmmo, true))) && item->IsKindOf(NAME_Ammo))
 	{
 		// Nothing to do here, except maybe res = false;? Would it make sense?
 		result = false;