diff options
| -rw-r--r-- | devtools/create_access/amazon_resources.cpp | 4 | ||||
| -rw-r--r-- | devtools/create_access/create_access_dat.cpp | 18 | ||||
| -rw-r--r-- | devtools/create_access/create_access_dat.h | 6 | ||||
| -rw-r--r-- | devtools/create_access/martian_resources.cpp | 4 | 
4 files changed, 15 insertions, 17 deletions
diff --git a/devtools/create_access/amazon_resources.cpp b/devtools/create_access/amazon_resources.cpp index 8156894b0d..f4b642ffbc 100644 --- a/devtools/create_access/amazon_resources.cpp +++ b/devtools/create_access/amazon_resources.cpp @@ -267,7 +267,7 @@ const byte *const CURSORS[AMAZON_NUM_CURSORS] = {  };  const uint CURSOR_SIZES[AMAZON_NUM_CURSORS] = {  	sizeof(MOUSE0), sizeof(MOUSE1), sizeof(MOUSE2), sizeof(MOUSE3), sizeof(CURSEYE), -	sizeof(CURSHAND), sizeof(CURSGET), sizeof(CURSCLIMB), sizeof(CURSTALK),	sizeof(CURSHELP) +	sizeof(CURSHAND), sizeof(CURSGET), sizeof(CURSCLIMB), sizeof(CURSTALK), sizeof(CURSHELP)  }; @@ -731,7 +731,7 @@ const int COMBO_TABLE[85][4] = {  };  const char *const NO_HELP_MESSAGE_ENG = -"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \ +	"WE ARE UNABLE TO PROVIDE YOU WITH ANY MORE HINTS.  YOUR IQ \  HAS DECREASED SO FAR THAT WE CAN NO LONGER PUT THE HINTS IN TERMS \  YOU CAN UNDERSTAND.";  const char *const NO_HINTS_MESSAGE_ENG = "THE HELP SYSTEM HAS BEEN TURNED OFF FOR THIS GAME."; diff --git a/devtools/create_access/create_access_dat.cpp b/devtools/create_access/create_access_dat.cpp index af9ab026c0..a1591ef6e5 100644 --- a/devtools/create_access/create_access_dat.cpp +++ b/devtools/create_access/create_access_dat.cpp @@ -46,7 +46,7 @@   * Series of index entries identifying each game:   * 1 byte  - Game type: 1 = Amazon, 2 = Martian Memorandum, 3 = Noctropolis   * 1 byte  - disc type: 0 = Floppy, 1 = CD, 2 = Common data shared across - *			all variations of the given game + *           all variations of the given game   * 1 byte  - Is Demo: 0 = Full game, 1 = Demo   * 1 byte  - Language (Common::Language)   * 4 bytes - File offset for the data for the game @@ -98,7 +98,7 @@ void writeHeader(int numExecutables) {  	// Write out version number  	outputFile.writeWord(VERSION_NUMBER); -	 +  	// Write out the number of entries the data file will contain  	outputFile.writeWord(numExecutables); @@ -109,8 +109,8 @@ void writeHeader(int numExecutables) {  void writeAmazonCommonData() {  	// Write out the header entry  	outputFile.seek(8); -	outputFile.writeByte(1);	// Amazon -	outputFile.writeByte(2);	// Common data +	outputFile.writeByte(1);    // Amazon +	outputFile.writeByte(2);    // Common data  	outputFile.writeByte(0);  	outputFile.writeByte(0);  	outputFile.writeLong(outputFile.size()); @@ -144,8 +144,8 @@ void writeAmazonCommonData() {  void writeMartianCommonData() {  	// Write out the header entry  	outputFile.seek(16); -	outputFile.writeByte(2);	// Martian -	outputFile.writeByte(2);	// Common data +	outputFile.writeByte(2);    // Martian +	outputFile.writeByte(2);    // Common data  	outputFile.writeByte(0);  	outputFile.writeByte(0);  	outputFile.writeLong(outputFile.size()); @@ -304,7 +304,7 @@ bool processExecutable(int exeIdx, const char *name) {  	for (uint idx = 0; idx < numFilenames; ++idx) {  		exeFile.seek(filenamesOffset + idx * 2);  		uint nameOffset = exeFile.readWord(); -		 +  		exeFile.seek(dataSegmentOffset + nameOffset);  		outputFile.writeString(exeFile);  	} @@ -319,7 +319,7 @@ bool processExecutable(int exeIdx, const char *name) {  		charOffsets.push_back(exeFile.readWord());  	outputFile.writeWord(charOffsets.size()); -	charOffsets.push_back(charsEnd);	 +	charOffsets.push_back(charsEnd);  	for (uint idx = 0; idx < charOffsets.size() - 1; ++idx) {  		if (charOffsets[idx] == 0) {  			outputFile.writeWord(0); @@ -353,7 +353,7 @@ bool processExecutable(int exeIdx, const char *name) {  		travelPos.push_back(Common::Point(xp, yp));  	} -	outputFile.writeWord(numRooms);	 +	outputFile.writeWord(numRooms);  	for (uint idx = 0; idx < numRooms; ++idx) {  		uint dataSize = 0; diff --git a/devtools/create_access/create_access_dat.h b/devtools/create_access/create_access_dat.h index 8b2af6b48b..4976edec46 100644 --- a/devtools/create_access/create_access_dat.h +++ b/devtools/create_access/create_access_dat.h @@ -166,11 +166,9 @@ public:  			uint32 result = pos();  			fseek(_f, currentPos, SEEK_SET);  			return result; -		} -		else if (_memPtr) { +		} else if (_memPtr) {  			return _size; -		} -		else { +		} else {  			return 0;  		}  	} diff --git a/devtools/create_access/martian_resources.cpp b/devtools/create_access/martian_resources.cpp index f631ce7e31..381b79a073 100644 --- a/devtools/create_access/martian_resources.cpp +++ b/devtools/create_access/martian_resources.cpp @@ -118,8 +118,8 @@ const byte MOUSE3[] = {  	0, 0  }; -const byte *const CURSORS[MARTIAN_NUM_CURSORS] = {  -	MOUSE0, MOUSE1, MOUSE2, MOUSE3  +const byte *const CURSORS[MARTIAN_NUM_CURSORS] = { +	MOUSE0, MOUSE1, MOUSE2, MOUSE3  };  const uint CURSOR_SIZES[MARTIAN_NUM_CURSORS] = {  	sizeof(MOUSE0), sizeof(MOUSE1), sizeof(MOUSE2), sizeof(MOUSE3)  | 
