Merge pull request #160 from tmyqlfpir/port

Fix random five scenario using classic weapons for last slot

src/game/mplayer/mplayer.c

@@ -1154,7 +1154,11 @@ void mpApplyWeaponSet(void)
 			mpSetWeaponSlot(i, random() % numoptions + 1);
 		}
 
+#ifndef PLATFORM_N64 // take into account the new classic weapons slots
+		mpSetWeaponSlot(i, MPWEAPON_DISABLED - 1);
+#else
 		mpSetWeaponSlot(i, mpGetNumWeaponOptions() - 1);
+#endif
 	}
 }
 

src/game/propobj.c

@@ -20060,7 +20060,7 @@ bool doorCalcIntendedFrac(struct doorobj *door)
 		if (door->base.flags3 & OBJFLAG3_DOOR_STICKY) {
 			s32 value = (random() % 64) + 30;
 
-#ifndef PLATFORM_N64 // emulate low fps cal rate for stackage test
+#ifndef PLATFORM_N64 // emulate low fps cal rate for stuckage test
 			if (((g_Vars.lvframenum % value) == 0)
 				&& ((g_Vars.lvframe60 & 3) == 0)) {
 #else