From 6e7a51b3db81a3b7298f9d872eb7dcf41622791b Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 7 Nov 2009 06:35:12 +0000 Subject: [PATCH] VC warning fixes git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4689 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clients2c.cpp | 2 +- source/src/protocol.cpp | 2 +- source/src/server.cpp | 2 +- source/src/serverfiles.h | 6 +++--- source/src/tools.cpp | 2 +- source/src/worldio.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 943c6cd1..4944e7e7 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -498,7 +498,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) break; } sniperrifle *sr = (sniperrifle *)p->weaponsel; - sr->setscope(val); + sr->setscope(val!=0); break; } diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp index 8f70fc1c..54d8e703 100644 --- a/source/src/protocol.cpp +++ b/source/src/protocol.cpp @@ -248,7 +248,7 @@ void filterlang(char *d, const char *s) void trimtrailingwhitespace(char *s) { - for(int n = strlen(s) - 1; n >= 0 && isspace(s[n]); n--) + for(int n = (int)strlen(s) - 1; n >= 0 && isspace(s[n]); n--) s[n] = '\0'; } diff --git a/source/src/server.cpp b/source/src/server.cpp index 515a1a09..c8548143 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -2634,7 +2634,7 @@ void process(ENetPacket *packet, int sender, int chan) gameevent &scoping = cl->addevent(); scoping.type = GE_SCOPING; seteventmillis(scoping.scoping); - scoping.scoping.scoped = getint(p); + scoping.scoping.scoped = getint(p)!=0; break; } diff --git a/source/src/serverfiles.h b/source/src/serverfiles.h index e86fea42..90103845 100644 --- a/source/src/serverfiles.h +++ b/source/src/serverfiles.h @@ -356,7 +356,7 @@ struct serveripblacklist : serverconfigfile } if(l[strspn(l, " ")]) { - for(int i = strlen(l) - 1; i > 0 && l[i] == ' '; i--) l[i] = '\0'; + for(int i = (int)strlen(l) - 1; i > 0 && l[i] == ' '; i--) l[i] = '\0'; logline(ACLOG_INFO," error in line %d, file %s: ignored '%s'", line, filename, l); errors++; } @@ -675,9 +675,9 @@ struct serverinfofile { c = strstr(s, "//"); if(c) *c = '\0'; // strip comments - for(n = strlen(s) - 1; n >= 0 && s[n] == ' '; n--) s[n] = '\0'; // strip trailing blanks + for(n = (int)strlen(s) - 1; n >= 0 && s[n] == ' '; n--) s[n] = '\0'; // strip trailing blanks filterrichtext(t, s + strspn(s, " "), MAXINFOLINELEN); // skip leading blanks - n = strlen(t); + n = (int)strlen(t); if(n) t += n + 1; } *t = '\0'; diff --git a/source/src/tools.cpp b/source/src/tools.cpp index 84087933..a829a67b 100644 --- a/source/src/tools.cpp +++ b/source/src/tools.cpp @@ -648,7 +648,7 @@ const char *hiddenpwd(const char *pwd, int showchars) static string text; s_strcpy(text, pwd); if(showchars > 0) sc = showchars; - for(int i = strlen(text) - 1; i >= sc; i--) text[i] = '*'; + for(int i = (int)strlen(text) - 1; i >= sc; i--) text[i] = '*'; return text; } //////////////// geometry utils //////////////// diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp index c5d88012..78914859 100644 --- a/source/src/worldio.cpp +++ b/source/src/worldio.cpp @@ -326,7 +326,7 @@ void checkmapdependencies(bool silent = false) // find required MediaPack (s) fo if(!usethis) { s_sprintf(reqmpak)("%s%s%s", reqmpak, reqmpak[0]=='\0'?"":",", mpdefs[j]); - usethis = (bool)(++usedmpaks); + if(++usedmpaks > 0) usethis = true; if(usedmpaks>25) conoutf("this map requires too many mediapacks."); // even if silent == true } }