Advertisement
Guest User

Untitled

a guest
Apr 9th, 2010
502
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.17 KB | None | 0 0
  1. diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/StringTree.cpp SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/StringTree.cpp
  2. --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/StringTree.cpp 2010-01-28 15:54:33.000000000 -0500
  3. +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/StringTree.cpp  2010-04-09 17:39:10.000000000 -0400
  4. @@ -50,7 +50,7 @@
  5.          
  6.          
  7.  void ValueHashTable::insert( valueHolder *inHolder ) {
  8. -    int b = (unsigned int)( inHolder->value ) % B;
  9. +    int b = (unsigned long int)( inHolder->value ) % B;
  10.      
  11.      mBins[b].push_back( inHolder );
  12.      }
  13. @@ -58,7 +58,7 @@
  14.  
  15.  
  16.  void ValueHashTable::remove( valueHolder *inHolder ) {
  17. -    int b = (unsigned int)( inHolder->value ) % B;
  18. +    int b = (unsigned long int)( inHolder->value ) % B;
  19.      
  20.      mBins[b].deleteElementEqualTo( inHolder );
  21.      }
  22. @@ -66,7 +66,7 @@
  23.  
  24.          
  25.  valueHolder *ValueHashTable::lookup( void *inValue ) {
  26. -    int b = (unsigned int)( inValue ) % B;
  27. +    int b = (unsigned long int)( inValue ) % B;
  28.      
  29.      SimpleVector<valueHolder *> *v = &( mBins[b] );
  30.      
  31. @@ -475,25 +475,25 @@
  32.          }
  33.      */
  34.  
  35. -    printf( "n%d; n%d [label = \"%c (%s) {%d}\"]; ",
  36. -            (int)this, (int)this, mChar, valueString, (int)this );
  37. +    printf( "n%lu; n%lu [label = \"%c (%s) {%lu}\"]; ",
  38. +            (unsigned long int)this, (unsigned long int)this, mChar, valueString, (unsigned long int)this );
  39.      
  40.      delete [] valueString;
  41.  
  42.      if( mLeft != NULL ) {
  43.          mLeft->print();
  44. -        printf( "n%d -> n%d [label = \"L\", weight=1]; ",
  45. -                (int)this, (int)mLeft );
  46. +        printf( "n%lu -> n%lu [label = \"L\", weight=1]; ",
  47. +                (unsigned long int)this, (unsigned long int)mLeft );
  48.          }
  49.      if( mDown != NULL ) {
  50.          mDown->print();
  51. -        printf( "n%d -> n%d [label = \"D\", weight=4]; ",
  52. -                (int)this, (int)mDown );
  53. +        printf( "n%lu -> n%lu [label = \"D\", weight=4]; ",
  54. +                (unsigned long int)this, (unsigned long int)mDown );
  55.          }
  56.      if( mRight != NULL ) {
  57.          mRight->print();
  58. -        printf( "n%d -> n%d [label = \"R\", weight=1]; ",
  59. -                (int)this, (int)mRight );
  60. +        printf( "n%lu -> n%lu [label = \"R\", weight=1]; ",
  61. +                (unsigned long int)this, (unsigned long int)mRight );
  62.          }
  63.  
  64.  
  65. diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/Tile.cpp SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/Tile.cpp
  66. --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/Tile.cpp   2010-04-07 02:03:47.000000000 -0400
  67. +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/Tile.cpp    2010-04-09 20:38:28.000000000 -0400
  68. @@ -212,7 +212,7 @@
  69.      
  70.      
  71.      p = addToUniqueID( p,
  72. -                       (unsigned char*)mPixelColors, mPixelDataLength );
  73. +                       (unsigned char*) mPixelColors, mPixelDataLength );
  74.      
  75.      p = addToUniqueID( p, (unsigned char*)mSetName, strlen( mSetName ) + 1 );
  76.      
  77. diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.cpp SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.cpp
  78. --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.cpp   2010-04-07 02:03:47.000000000 -0400
  79. +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.cpp    2010-04-09 20:39:02.707194313 -0400
  80. @@ -7,6 +7,7 @@
  81.  
  82.  #include <string.h>
  83.  #include <stdio.h>
  84. +#include <stdlib.h>
  85.  
  86.  
  87.  uniqueID defaultID = { { 0, 0, 0,
  88. @@ -36,7 +37,7 @@
  89.  
  90.  
  91.  partialUniqueID startUniqueID() {
  92. -    SHA_CTX ctx;
  93. +  SHA_CTX ctx;// = (SHA_CTX *)malloc(sizeof(SHA_CTX));
  94.      SHA1_Init( &ctx );
  95.      return ctx;
  96.      }
  97. diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.h SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.h
  98. --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.h 2010-01-27 13:07:40.000000000 -0500
  99. +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.h  2010-04-09 20:44:17.584683475 -0400
  100. @@ -6,7 +6,7 @@
  101.  
  102.  
  103.  typedef struct uniqueID {
  104. -        unsigned char bytes[U];
  105. +        unsigned char bytes[20];
  106.      } uniqueID;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement