shithub: duke3d

Info  •  Files  •  Log  •  Branches

Merge pull request #35 from darealshinji/cleanup-3

Cleanup: -Wparenthesis

--- a/Game/src/actors.c

+++ b/Game/src/actors.c

@@ -1471,7 +1471,7 @@

                 s->lotag-=3;

                 if(s->lotag <= 0)

                 {

-                    s->xvel = (32+TRAND&63);

+                    s->xvel = (32+(TRAND&63));

                     s->zvel = -(1024+(TRAND&1023));

                 }

             }

--- a/Game/src/duke3d.h

+++ b/Game/src/duke3d.h

@@ -124,7 +124,7 @@

 #define PLUTOPAK  (!VOLUMEONE && !VOLUMEALL) 

 #define VOLUMEONE (getGRPcrc32(0)==CRC_BASE_GRP_SHAREWARE_13)

 // VOLUMEALL = 1.3d full

-#define VOLUMEALL (getGRPcrc32(0)==CRC_BASE_GRP_FULL_13 || conVersion == 13 && getGRPcrc32(0)!=CRC_BASE_GRP_SHAREWARE_13 && getGRPcrc32(0)!=CRC_BASE_GRP_PLUTONIUM_14 && getGRPcrc32(0)!=CRC_BASE_GRP_ATOMIC_15)

+#define VOLUMEALL (getGRPcrc32(0)==CRC_BASE_GRP_FULL_13 || (conVersion == 13 && getGRPcrc32(0)!=CRC_BASE_GRP_SHAREWARE_13 && getGRPcrc32(0)!=CRC_BASE_GRP_PLUTONIUM_14 && getGRPcrc32(0)!=CRC_BASE_GRP_ATOMIC_15))

 #define SCREENSHOTPATH "screenshots"

--- a/Game/src/game.c

+++ b/Game/src/game.c

@@ -7489,7 +7489,7 @@

         while (string[i] != 0)

         {

                 character = string[i];

-                printchrasm(0xb8000+(int32_t)pos,1L,((int32_t)attribute<<8)+(int32_t)character);

+                printchrasm(0xb8000+(int32_t)pos,1L,(((int32_t)attribute<<8)+(int32_t)character));

                 i++;

                 pos+=2;

         }

--- a/Game/src/player.c

+++ b/Game/src/player.c

@@ -1227,13 +1227,13 @@

 	 {

         if(ud.screen_size > 4)

         {

-            rotatesprite(43<<16,(200-8-(tiles[SCUBAMASK].dim.height)<<16),65536,0,SCUBAMASK,0,p,2+16,windowx1,windowy1,windowx2,windowy2);

-            rotatesprite((320-43)<<16,(200-8-(tiles[SCUBAMASK].dim.height)<<16),65536,1024,SCUBAMASK,0,p,2+4+16,windowx1,windowy1,windowx2,windowy2);

+            rotatesprite((43<<16),(200-8-((tiles[SCUBAMASK].dim.height)<<16)),65536,0,SCUBAMASK,0,p,2+16,windowx1,windowy1,windowx2,windowy2);

+            rotatesprite(((320-43)<<16),(200-8-((tiles[SCUBAMASK].dim.height)<<16)),65536,1024,SCUBAMASK,0,p,2+4+16,windowx1,windowy1,windowx2,windowy2);

         }

         else

         {

-            rotatesprite(43<<16,(200-(tiles[SCUBAMASK].dim.height)<<16),65536,0,SCUBAMASK,0,p,2+16,windowx1,windowy1,windowx2,windowy2);

-            rotatesprite((320-43)<<16,(200-(tiles[SCUBAMASK].dim.height)<<16),65536,1024,SCUBAMASK,0,p,2+4+16,windowx1,windowy1,windowx2,windowy2);

+            rotatesprite((43<<16),(200-((tiles[SCUBAMASK].dim.height)<<16)),65536,0,SCUBAMASK,0,p,2+16,windowx1,windowy1,windowx2,windowy2);

+            rotatesprite(((320-43)<<16),(200-((tiles[SCUBAMASK].dim.height)<<16)),65536,1024,SCUBAMASK,0,p,2+4+16,windowx1,windowy1,windowx2,windowy2);

         }

 	 }

 }

@@ -1429,7 +1429,7 @@

 					else pal = sector[p->cursectnum].floorpal;

 					weapon_xoffset -= sintable[(768+((*kb)<<7))&2047]>>11;

-					gun_pos += sintable[(768+((*kb)<<7)&2047)]>>11;

+					gun_pos += sintable[(768+(((*kb)<<7)&2047))]>>11;

 					if(*kb > 0)

 					{