API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 28th, 2011
76
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.63 KB | None | 0 0
raw download clone embed print report
  1. Index: src/p_enemy.c
  2. ===================================================================
  3. --- src/p_enemy.c (revision 4004)
  4. +++ src/p_enemy.c (working copy)
  5. @@ -615,10 +615,10 @@
  6.  
  7. static fixed_t P_AvoidDropoff(mobj_t *actor)
  8. {
  9. - int yh=((tmbbox[BOXTOP] = actor->y+actor->radius)-bmaporgy)>>MAPBLOCKSHIFT;
  10. - int yl=((tmbbox[BOXBOTTOM]= actor->y-actor->radius)-bmaporgy)>>MAPBLOCKSHIFT;
  11. - int xh=((tmbbox[BOXRIGHT] = actor->x+actor->radius)-bmaporgx)>>MAPBLOCKSHIFT;
  12. - int xl=((tmbbox[BOXLEFT] = actor->x-actor->radius)-bmaporgx)>>MAPBLOCKSHIFT;
  13. + int yh=(unsigned)((tmbbox[BOXTOP] = actor->y+actor->radius)-bmaporgy)>>MAPBLOCKSHIFT;
  14. + int yl=(unsigned)((tmbbox[BOXBOTTOM]= actor->y-actor->radius)-bmaporgy)>>MAPBLOCKSHIFT;
  15. + int xh=(unsigned)((tmbbox[BOXRIGHT] = actor->x+actor->radius)-bmaporgx)>>MAPBLOCKSHIFT;
  16. + int xl=(unsigned)((tmbbox[BOXLEFT] = actor->x-actor->radius)-bmaporgx)>>MAPBLOCKSHIFT;
  17. int bx, by;
  18.  
  19. floorz = actor->z; // remember floor height
  20. @@ -907,8 +907,8 @@
  21.  
  22. if (cap->cnext != cap) // Empty list? bail out early
  23. {
  24. - int x = (actor->x - bmaporgx)>>MAPBLOCKSHIFT;
  25. - int y = (actor->y - bmaporgy)>>MAPBLOCKSHIFT;
  26. + int x = (unsigned)(actor->x - bmaporgx)>>MAPBLOCKSHIFT;
  27. + int y = (unsigned)(actor->y - bmaporgy)>>MAPBLOCKSHIFT;
  28. int d;
  29.  
  30. current_actor = actor;
  31. @@ -1668,10 +1668,10 @@
  32. viletryy =
  33. actor->y + actor->info->speed*yspeed[actor->movedir];
  34.  
  35. - xl = (viletryx - bmaporgx - MAXRADIUS*2)>>MAPBLOCKSHIFT;
  36. - xh = (viletryx - bmaporgx + MAXRADIUS*2)>>MAPBLOCKSHIFT;
  37. - yl = (viletryy - bmaporgy - MAXRADIUS*2)>>MAPBLOCKSHIFT;
  38. - yh = (viletryy - bmaporgy + MAXRADIUS*2)>>MAPBLOCKSHIFT;
  39. + xl = (unsigned)(viletryx - bmaporgx - MAXRADIUS*2)>>MAPBLOCKSHIFT;
  40. + xh = (unsigned)(viletryx - bmaporgx + MAXRADIUS*2)>>MAPBLOCKSHIFT;
  41. + yl = (unsigned)(viletryy - bmaporgy - MAXRADIUS*2)>>MAPBLOCKSHIFT;
  42. + yh = (unsigned)(viletryy - bmaporgy + MAXRADIUS*2)>>MAPBLOCKSHIFT;
  43.  
  44. vileobj = actor;
  45. for (bx=xl ; bx<=xh ; bx++)
  46. Index: src/p_map.c
  47. ===================================================================
  48. --- src/p_map.c (revision 4004)
  49. +++ src/p_map.c (working copy)
  50. @@ -316,10 +316,10 @@
  51.  
  52. // stomp on any things contacted
  53.  
  54. - xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
  55. - xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
  56. - yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
  57. - yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
  58. + xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
  59. + xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
  60. + yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
  61. + yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
  62.  
  63. for (bx=xl ; bx<=xh ; bx++)
  64. for (by=yl ; by<=yh ; by++)
  65. @@ -708,10 +708,10 @@
  66.  
  67. // Determine which blocks to look in for blocking lines
  68.  
  69. - xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
  70. - xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
  71. - yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
  72. - yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
  73. + xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
  74. + xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
  75. + yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
  76. + yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
  77.  
  78. // xl->xh, yl->yh determine the mapblock set to search
  79.  
  80. @@ -799,10 +799,10 @@
  81. // based on their origin point, and can overlap
  82. // into adjacent blocks by up to MAXRADIUS units.
  83.  
  84. - xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
  85. - xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
  86. - yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
  87. - yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
  88. + xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
  89. + xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
  90. + yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
  91. + yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
  92.  
  93.  
  94. for (bx=xl ; bx<=xh ; bx++)
  95. @@ -812,10 +812,10 @@
  96.  
  97. // check lines
  98.  
  99. - xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
  100. - xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
  101. - yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
  102. - yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
  103. + xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
  104. + xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
  105. + yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
  106. + yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
  107.  
  108. for (bx=xl ; bx<=xh ; bx++)
  109. for (by=yl ; by<=yh ; by++)
  110. @@ -1030,13 +1030,13 @@
  111.  
  112. void P_ApplyTorque(mobj_t *mo)
  113. {
  114. - int xl = ((tmbbox[BOXLEFT] =
  115. + int xl = (unsigned)((tmbbox[BOXLEFT] =
  116. mo->x - mo->radius) - bmaporgx) >> MAPBLOCKSHIFT;
  117. - int xh = ((tmbbox[BOXRIGHT] =
  118. + int xh = (unsigned)((tmbbox[BOXRIGHT] =
  119. mo->x + mo->radius) - bmaporgx) >> MAPBLOCKSHIFT;
  120. - int yl = ((tmbbox[BOXBOTTOM] =
  121. + int yl = (unsigned)((tmbbox[BOXBOTTOM] =
  122. mo->y - mo->radius) - bmaporgy) >> MAPBLOCKSHIFT;
  123. - int yh = ((tmbbox[BOXTOP] =
  124. + int yh = (unsigned)((tmbbox[BOXTOP] =
  125. mo->y + mo->radius) - bmaporgy) >> MAPBLOCKSHIFT;
  126. int bx,by,flags = mo->intflags; //Remember the current state, for gear-change
  127.  
  128. @@ -1910,10 +1910,10 @@
  129. fixed_t dist;
  130.  
  131. dist = (damage+MAXRADIUS)<<FRACBITS;
  132. - yh = (spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
  133. - yl = (spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
  134. - xh = (spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
  135. - xl = (spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
  136. + yh = (unsigned)(spot->y + dist - bmaporgy)>>MAPBLOCKSHIFT;
  137. + yl = (unsigned)(spot->y - dist - bmaporgy)>>MAPBLOCKSHIFT;
  138. + xh = (unsigned)(spot->x + dist - bmaporgx)>>MAPBLOCKSHIFT;
  139. + xl = (unsigned)(spot->x - dist - bmaporgx)>>MAPBLOCKSHIFT;
  140. bombspot = spot;
  141. bombsource = source;
  142. bombdamage = damage;
  143. @@ -2272,10 +2272,10 @@
  144.  
  145. validcount++; // used to make sure we only process a line once
  146.  
  147. - xl = (tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
  148. - xh = (tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
  149. - yl = (tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
  150. - yh = (tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
  151. + xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
  152. + xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
  153. + yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
  154. + yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
  155.  
  156. for (bx=xl ; bx<=xh ; bx++)
  157. for (by=yl ; by<=yh ; by++)
  158. Index: src/p_maputl.c
  159. ===================================================================
  160. --- src/p_maputl.c (revision 4004)
  161. +++ src/p_maputl.c (working copy)
  162. @@ -323,8 +323,8 @@
  163. if (!(thing->flags & MF_NOBLOCKMAP))
  164. {
  165. // inert things don't need to be in blockmap
  166. - int blockx = (thing->x - bmaporgx)>>MAPBLOCKSHIFT;
  167. - int blocky = (thing->y - bmaporgy)>>MAPBLOCKSHIFT;
  168. + int blockx = (unsigned)(thing->x - bmaporgx)>>MAPBLOCKSHIFT;
  169. + int blocky = (unsigned)(thing->y - bmaporgy)>>MAPBLOCKSHIFT;
  170. if (blockx>=0 && blockx < bmapwidth && blocky>=0 && blocky < bmapheight)
  171. {
  172. // killough 8/11/98: simpler scheme using pointer-to-pointer prev
  173. @@ -603,13 +603,13 @@
  174.  
  175. x1 -= bmaporgx;
  176. y1 -= bmaporgy;
  177. - xt1 = x1>>MAPBLOCKSHIFT;
  178. - yt1 = y1>>MAPBLOCKSHIFT;
  179. + xt1 = (unsigned)x1>>MAPBLOCKSHIFT;
  180. + yt1 = (unsigned)y1>>MAPBLOCKSHIFT;
  181.  
  182. x2 -= bmaporgx;
  183. y2 -= bmaporgy;
  184. - xt2 = x2>>MAPBLOCKSHIFT;
  185. - yt2 = y2>>MAPBLOCKSHIFT;
  186. + xt2 = (unsigned)x2>>MAPBLOCKSHIFT;
  187. + yt2 = (unsigned)y2>>MAPBLOCKSHIFT;
  188.  
  189. if (xt2 > xt1)
  190. {
  191. Index: src/p_setup.c
  192. ===================================================================
  193. --- src/p_setup.c (revision 4004)
  194. +++ src/p_setup.c (working copy)
  195. @@ -2131,19 +2131,19 @@
  196. }
  197.  
  198. // adjust bounding box to map blocks
  199. - block = (bbox[BOXTOP]-bmaporgy+MAXRADIUS)>>MAPBLOCKSHIFT;
  200. + block = (unsigned)(bbox[BOXTOP]-bmaporgy+MAXRADIUS)>>MAPBLOCKSHIFT;
  201. block = block >= bmapheight ? bmapheight-1 : block;
  202. sector->blockbox[BOXTOP]=block;
  203.  
  204. - block = (bbox[BOXBOTTOM]-bmaporgy-MAXRADIUS)>>MAPBLOCKSHIFT;
  205. + block = (unsigned)(bbox[BOXBOTTOM]-bmaporgy-MAXRADIUS)>>MAPBLOCKSHIFT;
  206. block = block < 0 ? 0 : block;
  207. sector->blockbox[BOXBOTTOM]=block;
  208.  
  209. - block = (bbox[BOXRIGHT]-bmaporgx+MAXRADIUS)>>MAPBLOCKSHIFT;
  210. + block = (unsigned)(bbox[BOXRIGHT]-bmaporgx+MAXRADIUS)>>MAPBLOCKSHIFT;
  211. block = block >= bmapwidth ? bmapwidth-1 : block;
  212. sector->blockbox[BOXRIGHT]=block;
  213.  
  214. - block = (bbox[BOXLEFT]-bmaporgx-MAXRADIUS)>>MAPBLOCKSHIFT;
  215. + block = (unsigned)(bbox[BOXLEFT]-bmaporgx-MAXRADIUS)>>MAPBLOCKSHIFT;
  216. block = block < 0 ? 0 : block;
  217. sector->blockbox[BOXLEFT]=block;
  218. }
  219. Index: src/p_sight.c
  220. ===================================================================
  221. --- src/p_sight.c (revision 4004)
  222. +++ src/p_sight.c (working copy)
  223. @@ -236,13 +236,13 @@
  224.  
  225. x1 -= bmaporgx;
  226. y1 -= bmaporgy;
  227. - xt1 = x1>>MAPBLOCKSHIFT;
  228. - yt1 = y1>>MAPBLOCKSHIFT;
  229. + xt1 = (unsigned)x1>>MAPBLOCKSHIFT;
  230. + yt1 = (unsigned)y1>>MAPBLOCKSHIFT;
  231.  
  232. x2 -= bmaporgx;
  233. y2 -= bmaporgy;
  234. - xt2 = x2>>MAPBLOCKSHIFT;
  235. - yt2 = y2>>MAPBLOCKSHIFT;
  236. + xt2 = (unsigned)x2>>MAPBLOCKSHIFT;
  237. + yt2 = (unsigned)y2>>MAPBLOCKSHIFT;
  238.  
  239. // points should never be out of bounds, but check once instead of
  240. // each block
  241. Index: src/p_spec.c
  242. ===================================================================
  243. --- src/p_spec.c (revision 4004)
  244. +++ src/p_spec.c (working copy)
  245. @@ -3360,10 +3360,10 @@
  246. tmbbox[BOXRIGHT] = p->x + radius;
  247. tmbbox[BOXLEFT] = p->x - radius;
  248.  
  249. - xl = (tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
  250. - xh = (tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
  251. - yl = (tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
  252. - yh = (tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
  253. + xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
  254. + xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
  255. + yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
  256. + yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
  257. for (bx=xl ; bx<=xh ; bx++)
  258. for (by=yl ; by<=yh ; by++)
  259. P_BlockThingsIterator(bx,by,PIT_PushThing);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!