Skip to content

Commit d31f07b

Browse files
author
kwolekr
committedFeb 26, 2013
Fix most warnings, re-fix MSVC compile error
·
5.11.00.4.5
1 parent 979ca23 commit d31f07b

10 files changed

+22
-19
lines changed
 

‎src/base64.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ bool base64_is_valid(std::string const& s);
77
std::string base64_encode(unsigned char const* , unsigned int len);
88
std::string base64_decode(std::string const& s);
99

10-
#endif // BASE64_HEADER
10+
#endif // BASE64_HEADER

‎src/content_cso.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2525
#include "log.h"
2626
#include "map.h"
2727

28+
/*
2829
static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
2930
float txs, float tys, int col, int row)
3031
{
@@ -33,6 +34,7 @@ static void setBillboardTextureMatrix(scene::IBillboardSceneNode *bill,
3334
matrix.setTextureTranslate(txs*col, tys*row);
3435
matrix.setTextureScale(txs, tys);
3536
}
37+
*/
3638

3739
class SmokePuffCSO: public ClientSimpleObject
3840
{

‎src/emerge.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ EmergeManager::EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef) {
5858
if (g_settings->get("num_emerge_threads").empty()) {
5959
int nprocs = porting::getNumberOfProcessors();
6060
// leave a proc for the main thread and one for some other misc threads
61-
nthreads = (nprocs > 2) ? nthreads = nprocs - 2 : 1;
61+
nthreads = (nprocs > 2) ? nprocs - 2 : 1;
6262
} else {
6363
nthreads = g_settings->getU16("num_emerge_threads");
6464
}
@@ -81,7 +81,7 @@ EmergeManager::EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef) {
8181

8282

8383
EmergeManager::~EmergeManager() {
84-
for (int i = 0; i != emergethread.size(); i++) {
84+
for (unsigned int i = 0; i != emergethread.size(); i++) {
8585
emergethread[i]->setRun(false);
8686
emergethread[i]->qevent.signal();
8787
emergethread[i]->stop();
@@ -101,7 +101,7 @@ void EmergeManager::initMapgens(MapgenParams *mgparams) {
101101
return;
102102

103103
this->params = mgparams;
104-
for (int i = 0; i != emergethread.size(); i++) {
104+
for (unsigned int i = 0; i != emergethread.size(); i++) {
105105
mg = createMapgen(params->mg_name, 0, params);
106106
if (!mg) {
107107
infostream << "EmergeManager: falling back to mapgen v6" << std::endl;
@@ -152,7 +152,7 @@ bool EmergeManager::enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate
152152

153153
// insert into the EmergeThread queue with the least items
154154
int lowestitems = emergethread[0]->blockqueue.size();
155-
for (int i = 1; i != emergethread.size(); i++) {
155+
for (unsigned int i = 1; i != emergethread.size(); i++) {
156156
int nitems = emergethread[i]->blockqueue.size();
157157
if (nitems < lowestitems) {
158158
idx = i;
@@ -259,7 +259,7 @@ void EmergeManager::setParamsToSettings(Settings *settings) {
259259
}
260260

261261

262-
bool EmergeManager::registerMapgen(std::string mgname, MapgenFactory *mgfactory) {
262+
void EmergeManager::registerMapgen(std::string mgname, MapgenFactory *mgfactory) {
263263
mglist.insert(std::make_pair(mgname, mgfactory));
264264
infostream << "EmergeManager: registered mapgen " << mgname << std::endl;
265265
}

‎src/emerge.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class EmergeManager {
7575
MapgenParams *createMapgenParams(std::string mgname);
7676
bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
7777

78-
bool registerMapgen(std::string name, MapgenFactory *mgfactory);
78+
void registerMapgen(std::string name, MapgenFactory *mgfactory);
7979
MapgenParams *getParamsFromSettings(Settings *settings);
8080
void setParamsToSettings(Settings *settings);
8181

‎src/game.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2816,12 +2816,12 @@ void the_game(
28162816
char temptext[300];
28172817
snprintf(temptext, 300,
28182818
"(% .1f, % .1f, % .1f)"
2819-
" (yaw = %.1f) (seed = %lli)",
2819+
" (yaw = %.1f) (seed = %llu)",
28202820
player_position.X/BS,
28212821
player_position.Y/BS,
28222822
player_position.Z/BS,
28232823
wrapDegrees_0_360(camera_yaw),
2824-
client.getMapSeed());
2824+
(unsigned long long)client.getMapSeed());
28252825

28262826
guitext2->setText(narrow_to_wide(temptext).c_str());
28272827
guitext2->setVisible(true);

‎src/map.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3283,7 +3283,7 @@ void ServerMap::save(ModifiedState save_level)
32833283

32843284
block_count_all++;
32853285

3286-
if(block->getModified() >= save_level)
3286+
if(block->getModified() >= (u32)save_level)
32873287
{
32883288
// Lazy beginSave()
32893289
if(!save_started){

‎src/noise.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ void Noise::gradientMap3D(float x, float y, float z,
507507

508508

509509
float *Noise::perlinMap2D(float x, float y) {
510-
float a = 0.0, f = 1.0, g = 1.0;
510+
float f = 1.0, g = 1.0;
511511
int i, j, index, oct;
512512

513513
x /= np->spread.X;
@@ -537,7 +537,7 @@ float *Noise::perlinMap2D(float x, float y) {
537537

538538

539539
float *Noise::perlinMap3D(float x, float y, float z) {
540-
float a = 0.0, f = 1.0, g = 1.0;
540+
float f = 1.0, g = 1.0;
541541
int i, j, k, index, oct;
542542

543543
x /= np->spread.X;

‎src/server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ void Server::AsyncRunStep()
16521652
{
16531653
counter = 0.0;
16541654

1655-
for (int i = 0; i != m_emerge->emergethread.size(); i++)
1655+
for (unsigned int i = 0; i != m_emerge->emergethread.size(); i++)
16561656
m_emerge->emergethread[i]->trigger();
16571657

16581658
// Update m_enable_rollback_recording here too

‎src/test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ struct TestCompress: public TestBase
462462
<<os_decompressed.str().size()<<std::endl;
463463
std::string str_decompressed = os_decompressed.str();
464464
UTEST(str_decompressed.size() == data_in.size(), "Output size not"
465-
" equal (output: %i, input: %i)",
465+
" equal (output: %u, input: %u)",
466466
str_decompressed.size(), data_in.size());
467467
for(u32 i=0; i<size && i<str_decompressed.size(); i++){
468468
UTEST(str_decompressed[i] == data_in[i],

‎src/util/serialize.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,12 @@ inline void writeARGB8(u8 *data, video::SColor p)
208208

209209
inline video::SColor readARGB8(const u8 *data)
210210
{
211-
video::SColor p;
212-
p.setAlpha(readU8(&data[0]));
213-
p.setRed(readU8(&data[1]));
214-
p.setGreen(readU8(&data[2]));
215-
p.setBlue(readU8(&data[3]));
211+
video::SColor p(
212+
readU8(&data[0]),
213+
readU8(&data[1]),
214+
readU8(&data[2]),
215+
readU8(&data[3])
216+
);
216217
return p;
217218
}
218219

0 commit comments

Comments
 (0)
Please sign in to comment.