Merge branch 'master' into addBetterMakefileDebugFlags

src/ArmsItem.cpp

@@ -57,6 +57,7 @@ BOOL AddArmsData(long code, long max_num)
 		gArmsData[i].level = 1;
 	}
 
+	// Set weapon and ammo
 	gArmsData[i].code = code;
 	gArmsData[i].max_num += max_num;
 	gArmsData[i].num += max_num;
@@ -85,6 +86,7 @@ BOOL SubArmsData(long code)
 	for (i += 1; i < ARMS_MAX; ++i)
 		gArmsData[i - 1] = gArmsData[i];
 
+	// Clear farthest weapon and select first
 	gArmsData[i - 1].code = 0;
 	gSelectedArms = 0;
 	return TRUE;

src/Types.h

@@ -1,3 +1,3 @@
 #pragma once
 
-//This was originally some sort of POSIX standard thing? leftover from the linux port
+//This was originally some sort of POSIX standard thing? leftover from the Linux port