Skip to content

Commit

Permalink
Reformat source again
Browse files Browse the repository at this point in the history
`astyle -p -H -f -j -z2 -c -k3 -U -A8 *.{cpp,h}`

This should really be in a git hook or something. Also, astyle breaks
string literals in options.cpp for some reason. Sigh.
  • Loading branch information
willglynn committed Nov 8, 2012
1 parent e2c1e84 commit ef79a30
Show file tree
Hide file tree
Showing 26 changed files with 665 additions and 478 deletions.
2 changes: 1 addition & 1 deletion src/game/Buzz_inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define __BUZZ_INC_H__ 1

extern "C" {
int game_main(int argc, char *argv[]);
int game_main(int argc, char *argv[]);
}

#ifdef __GNUG__
Expand Down
10 changes: 5 additions & 5 deletions src/game/admin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ void FileAccess(char mode)
}

readLen = SaveHdr->compSize;
load_buffer = (REPLAY*)malloc(readLen);
load_buffer = (REPLAY *)malloc(readLen);

fread(load_buffer, 1, readLen, fin);

Expand Down Expand Up @@ -483,7 +483,7 @@ void FileAccess(char mode)
}

// Read the Replay Data
load_buffer = (REPLAY*)malloc((sizeof(REPLAY)) * MAX_REPLAY_ITEMS);
load_buffer = (REPLAY *)malloc((sizeof(REPLAY)) * MAX_REPLAY_ITEMS);
fread(load_buffer, 1, sizeof(REPLAY) * MAX_REPLAY_ITEMS, fin);

if (endianSwap) {
Expand All @@ -509,7 +509,7 @@ void FileAccess(char mode)
eventSize = fileLength - ftell(fin);

// Read the Event Data
load_buffer = (REPLAY*)malloc(eventSize);
load_buffer = (REPLAY *)malloc(eventSize);
fread(load_buffer, 1, eventSize, fin);
fclose(fin);

Expand Down Expand Up @@ -1728,7 +1728,7 @@ void EndOfTurnSave(char *inData, int dataLen)
{
FILE *fout = NULL;
int compressedLen = 0;
char * buffer = (char *)xmalloc( dataLen * 2);
char *buffer = (char *)xmalloc(dataLen * 2);

// Remove old save data
remove_savedat("ENDTURN.TMP");
Expand All @@ -1753,7 +1753,7 @@ void EndOfTurnSave(char *inData, int dataLen)

fwrite(buffer, compressedLen, 1, fout);
fclose(fout);
free( buffer );
free(buffer);
}

// EOF

0 comments on commit ef79a30

Please sign in to comment.