diff --git a/Source/cursor.cpp b/Source/cursor.cpp
index f88b83507..80b2044ea 100644
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@@ -127,7 +127,7 @@ void CheckTown()
 			    || cursmx == missile[mx]._mix - 2 && cursmy == missile[mx]._miy - 2
 			    || cursmx == missile[mx]._mix - 1 && cursmy == missile[mx]._miy - 2
 			    || cursmx == missile[mx]._mix && cursmy == missile[mx]._miy) {
-				trigflag = 1;
+				trigflag = TRUE;
 				ClearPanel();
 				strcpy(infostr, "Town Portal");
 				sprintf(tempstr, "from %s", plr[missile[mx]._misource]._pName);
@@ -153,7 +153,7 @@ void CheckRportal()
 			    || cursmx == missile[mx]._mix - 2 && cursmy == missile[mx]._miy - 2
 			    || cursmx == missile[mx]._mix - 1 && cursmy == missile[mx]._miy - 2
 			    || cursmx == missile[mx]._mix && cursmy == missile[mx]._miy) {
-				trigflag = 1;
+				trigflag = TRUE;
 				ClearPanel();
 				strcpy(infostr, "Portal to");
 				if (!setlevel)
@@ -261,7 +261,7 @@ void CheckCursMove()
 	pcursplr = -1;
 	uitemflag = 0;
 	panelflag = 0;
-	trigflag = 0;
+	trigflag = FALSE;
 
 	if(plr[myplr]._pInvincible) {
 		return;
diff --git a/Source/trigs.cpp b/Source/trigs.cpp
index e4634bc63..090862aea 100644
--- a/Source/trigs.cpp
+++ b/Source/trigs.cpp
@@ -101,8 +101,8 @@ void InitTownTriggers()
 
 	numtrigs = 1;
 
-	if(gbMaxPlayers == 4) {
-		for(i = 0; i < 3; i++) {
+	if(gbMaxPlayers == MAX_PLRS) {
+		for(i = 0; i < sizeof(townwarps) / sizeof(townwarps[0]); i++) {
 			townwarps[i] = TRUE;
 		}
 		trigs[1]._tx = 49;