Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/StringTree.cpp SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/StringTree.cpp
- --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/StringTree.cpp 2010-01-28 15:54:33.000000000 -0500
- +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/StringTree.cpp 2010-04-09 17:39:10.000000000 -0400
- @@ -50,7 +50,7 @@
- void ValueHashTable::insert( valueHolder *inHolder ) {
- - int b = (unsigned int)( inHolder->value ) % B;
- + int b = (unsigned long int)( inHolder->value ) % B;
- mBins[b].push_back( inHolder );
- }
- @@ -58,7 +58,7 @@
- void ValueHashTable::remove( valueHolder *inHolder ) {
- - int b = (unsigned int)( inHolder->value ) % B;
- + int b = (unsigned long int)( inHolder->value ) % B;
- mBins[b].deleteElementEqualTo( inHolder );
- }
- @@ -66,7 +66,7 @@
- valueHolder *ValueHashTable::lookup( void *inValue ) {
- - int b = (unsigned int)( inValue ) % B;
- + int b = (unsigned long int)( inValue ) % B;
- SimpleVector<valueHolder *> *v = &( mBins[b] );
- @@ -475,25 +475,25 @@
- }
- */
- - printf( "n%d; n%d [label = \"%c (%s) {%d}\"]; ",
- - (int)this, (int)this, mChar, valueString, (int)this );
- + printf( "n%lu; n%lu [label = \"%c (%s) {%lu}\"]; ",
- + (unsigned long int)this, (unsigned long int)this, mChar, valueString, (unsigned long int)this );
- delete [] valueString;
- if( mLeft != NULL ) {
- mLeft->print();
- - printf( "n%d -> n%d [label = \"L\", weight=1]; ",
- - (int)this, (int)mLeft );
- + printf( "n%lu -> n%lu [label = \"L\", weight=1]; ",
- + (unsigned long int)this, (unsigned long int)mLeft );
- }
- if( mDown != NULL ) {
- mDown->print();
- - printf( "n%d -> n%d [label = \"D\", weight=4]; ",
- - (int)this, (int)mDown );
- + printf( "n%lu -> n%lu [label = \"D\", weight=4]; ",
- + (unsigned long int)this, (unsigned long int)mDown );
- }
- if( mRight != NULL ) {
- mRight->print();
- - printf( "n%d -> n%d [label = \"R\", weight=1]; ",
- - (int)this, (int)mRight );
- + printf( "n%lu -> n%lu [label = \"R\", weight=1]; ",
- + (unsigned long int)this, (unsigned long int)mRight );
- }
- diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/Tile.cpp SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/Tile.cpp
- --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/Tile.cpp 2010-04-07 02:03:47.000000000 -0400
- +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/Tile.cpp 2010-04-09 20:38:28.000000000 -0400
- @@ -212,7 +212,7 @@
- p = addToUniqueID( p,
- - (unsigned char*)mPixelColors, mPixelDataLength );
- + (unsigned char*) mPixelColors, mPixelDataLength );
- p = addToUniqueID( p, (unsigned char*)mSetName, strlen( mSetName ) + 1 );
- diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.cpp SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.cpp
- --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.cpp 2010-04-07 02:03:47.000000000 -0400
- +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.cpp 2010-04-09 20:39:02.707194313 -0400
- @@ -7,6 +7,7 @@
- #include <string.h>
- #include <stdio.h>
- +#include <stdlib.h>
- uniqueID defaultID = { { 0, 0, 0,
- @@ -36,7 +37,7 @@
- partialUniqueID startUniqueID() {
- - SHA_CTX ctx;
- + SHA_CTX ctx;// = (SHA_CTX *)malloc(sizeof(SHA_CTX));
- SHA1_Init( &ctx );
- return ctx;
- }
- diff -ur SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.h SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.h
- --- SleepIsDeath_v13_UnixSource_orig/SleepIsDeath/gameSource/uniqueID.h 2010-01-27 13:07:40.000000000 -0500
- +++ SleepIsDeath_v13_UnixSource/SleepIsDeath/gameSource/uniqueID.h 2010-04-09 20:44:17.584683475 -0400
- @@ -6,7 +6,7 @@
- typedef struct uniqueID {
- - unsigned char bytes[U];
- + unsigned char bytes[20];
- } uniqueID;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement