client.cpp: typo fix and break; fix to make some compilers happy

nerzhul · nerzhul · commit 0e93eefb8f0b · 2015-03-13T22:08:48.000+01:00
diff --git a/src/client.cpp b/src/client.cpp
@@ -951,7 +951,7 @@ void Client::interact(u8 action, const PointedThing& pointed)
 {
 	if(m_state != LC_Ready) {
 		errorstream << "Client::interact() "
-				"cancelled (not connected)"
+				"Canceled (not connected)"
 				<< std::endl;
 		return;
 	}
@@ -1296,6 +1296,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)
 	break;
 	default:
 		FATAL_ERROR("Invalid inventory location type.");
+		break;
 	}
 	return NULL;
 }

Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,7 @@ void Client::interact(u8 action, const PointedThing& pointed)`
`951`	`951`	`{`
`952`	`952`	`if(m_state != LC_Ready) {`
`953`	`953`	`errorstream << "Client::interact() "`
`954`		`- "cancelled (not connected)"`
	`954`	`+ "Canceled (not connected)"`
`955`	`955`	`<< std::endl;`
`956`	`956`	`return;`
`957`	`957`	`}`
`@@ -1296,6 +1296,7 @@ Inventory* Client::getInventory(const InventoryLocation &loc)`
`1296`	`1296`	`break;`
`1297`	`1297`	`default:`
`1298`	`1298`	`FATAL_ERROR("Invalid inventory location type.");`
	`1299`	`+ break;`
`1299`	`1300`	`}`
`1300`	`1301`	`return NULL;`
`1301`	`1302`	`}`