Warning fixes, refactor

src/voxels/ChunksController.cpp

@@ -185,7 +185,7 @@ void ChunksController::calculateLights() {
 	freeLoader->lights(chunk, (Chunk**)closes);
 }
 
-bool ChunksController::_buildMeshes(VoxelRenderer* renderer, int tick) {
+bool ChunksController::_buildMeshes() {
 	const int w = chunks->w;
 	const int d = chunks->d;
 

src/voxels/ChunksController.h

@@ -22,7 +22,7 @@ public:
 	int countFreeLoaders();
 	bool loadVisible(WorldFiles* worldFiles);
 	void calculateLights();
-	bool _buildMeshes(VoxelRenderer* renderer, int tick);
+	bool _buildMeshes();
 };
 
 #endif /* VOXELS_CHUNKSCONTROLLER_H_ */

src/voxels/WorldGenerator.cpp

@@ -31,11 +31,11 @@ public:
 	}
 
 	void setSeed(int number){
-		seed = ((unsigned short)(number*23729) xor (unsigned short)(number+16786));
+		seed = ((unsigned short)(number*23729) ^ (unsigned short)(number+16786));
 		rand();
 	}
 	void setSeed(int number1,int number2){
-		seed = (((unsigned short)(number1*23729) or (unsigned short)(number2%16786)) xor (unsigned short)(number2*number1));
+		seed = (((unsigned short)(number1*23729) | (unsigned short)(number2%16786)) ^ (unsigned short)(number2*number1));
 		rand();
 	}
 };