Make struct sctstr member sct_effic signed

[empserver] / src / lib / commands / setsect.c

diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c
index 117e7315537991dbdacab7abfd263ed826e232be..92be99cf751469f3ceb8682bdf6d61b9c6b4fe24 100644 (file)
--- a/src/lib/commands/setsect.c
+++ b/src/lib/commands/setsect.c
@@ -57,7 +57,7 @@ setsector(void)
     what = getstarg(player->argp[1],
                    "Give What (iron, gold, oil, uranium, fertility, owner, eff., mob., work, avail., oldown, mines)? ",
                    buf);
-    if (what == 0)
+    if (!what)
        return RET_SYN;
     char0 = what[0];
     char1 = what[1];
@@ -67,8 +67,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_min;
@@ -88,8 +88,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_gmin;
@@ -111,8 +111,8 @@ setsector(void)
            if (!snxtsct(&nstr, player->argp[2]))
                return RET_SYN;
            while (nxtsct(&nstr, &sect) > 0) {
-               if (!(p = getstarg(player->argp[3], "What value : ", buf))
-                   || (*p == '\0'))
+               p = getstarg(player->argp[3], "What value : ", buf);
+               if (!p || !*p)
                    return RET_SYN;
                amt = atoi(p);
                current = sect.sct_oil;
@@ -132,8 +132,8 @@ setsector(void)
            if (!snxtsct(&nstr, player->argp[2]))
                return RET_SYN;
            while (nxtsct(&nstr, &sect) > 0) {
-               if (!(p = getstarg(player->argp[3], "What value : ", buf))
-                   || (*p == '\0'))
+               p = getstarg(player->argp[3], "What value : ", buf);
+               if (!p || !*p)
                    return RET_SYN;
                amt = atoi(p);
                if ((amt < 0) || (amt > MAXNOC - 1))
@@ -158,8 +158,8 @@ setsector(void)
            if (!snxtsct(&nstr, player->argp[2]))
                return RET_SYN;
            while (nxtsct(&nstr, &sect) > 0) {
-               if (!(p = getstarg(player->argp[3], "What value : ", buf))
-                   || (*p == '\0'))
+               p = getstarg(player->argp[3], "What value : ", buf);
+               if (!p || !*p)
                    return RET_SYN;
                amt = atoi(p);
                if ((amt < 0) || (amt > MAXNOC - 1))
@@ -181,8 +181,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_effic;
@@ -193,7 +193,7 @@ setsector(void)
                current = 100;
            pr("Efficiency in %s changed to %d.\n",
               xyas(sect.sct_x, sect.sct_y, player->cnum), current);
-           sect.sct_effic = (unsigned char)current;
+           sect.sct_effic = current;
            putsect(&sect);
        }
        break;
@@ -203,8 +203,8 @@ setsector(void)
            if (!snxtsct(&nstr, player->argp[2]))
                return RET_SYN;
            while (nxtsct(&nstr, &sect) > 0) {
-               if (!(p = getstarg(player->argp[3], "What value : ", buf))
-                   || (*p == '\0'))
+               p = getstarg(player->argp[3], "What value : ", buf);
+               if (!p || !*p)
                    return RET_SYN;
                amt = atoi(p);
                current = sect.sct_mines;
@@ -223,8 +223,8 @@ setsector(void)
            if (!snxtsct(&nstr, player->argp[2]))
                return RET_SYN;
            while (nxtsct(&nstr, &sect) > 0) {
-               if (!(p = getstarg(player->argp[3], "What value : ", buf))
-                   || (*p == '\0'))
+               p = getstarg(player->argp[3], "What value : ", buf);
+               if (!p || !*p)
                    return RET_SYN;
                amt = atoi(p);
                current = sect.sct_mobil;
@@ -248,8 +248,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_avail;
@@ -268,8 +268,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_work;
@@ -288,8 +288,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_fertil;
@@ -309,8 +309,8 @@ setsector(void)
        if (!snxtsct(&nstr, player->argp[2]))
            return RET_SYN;
        while (nxtsct(&nstr, &sect) > 0) {
-           if (!(p = getstarg(player->argp[3], "What value : ", buf)) ||
-               (*p == '\0'))
+           p = getstarg(player->argp[3], "What value : ", buf);
+           if (!p || !*p)
                return RET_SYN;
            amt = atoi(p);
            current = sect.sct_uran;