libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hugo: Some formatting fixes.

Browse Source 
svn-id: r52265
This commit is contained in:
Johannes Schickel 2010-08-21 17:27:48 +00:00
parent 4742b4d728
commit 1a0d7c87d3
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/hugo/game.h
View File

@ -868,13 +868,13 @@ struct objBlock_t {
uint32 objLength;
};
#include "common/pack-start.h" // START STRUCT PACKING
struct sound_hdr_t { // Sound file lookup entry
uint16 size; // Size of sound data in bytes
uint32 offset; // Offset of sound data in file
#include "common/pack-start.h" // START STRUCT PACKING
struct sound_hdr_t { // Sound file lookup entry
uint16 size; // Size of sound data in bytes
uint32 offset; // Offset of sound data in file
} PACKED_STRUCT;
#include "common/pack-end.h" // END STRUCT PACKING
#include "common/pack-end.h" // END STRUCT PACKING
}
} // End of namespace Hugo
#endif

24
engines/hugo/parser.cpp
View File

@ -53,8 +53,7 @@ namespace Hugo {
#define CY(Y) HIWORD(Y)
Parser::Parser(HugoEngine &vm) :
_vm(vm), _putIndex(0), _getIndex(0) {
_checkDoubleF1Fl = false;
_vm(vm), _putIndex(0), _getIndex(0), _checkDoubleF1Fl(false) {
}
void Parser::keyHandler(uint16 nChar, uint16 nFlags) {
@ -118,7 +117,7 @@ void Parser::keyHandler(uint16 nChar, uint16 nFlags) {
}
break;
}
if ((_checkDoubleF1Fl) && (nChar != Common::KEYCODE_F1))
if (_checkDoubleF1Fl && (nChar != Common::KEYCODE_F1))
_checkDoubleF1Fl = false;
}
@ -682,9 +681,9 @@ bool Parser::isObjectVerb(object_t *obj, char *line, char *comment) {
void Parser::showDosInventory() {
// Show user all objects being carried in a variable width 2 column format
static const char *blanks = " ";
uint16 index, len, len1 = 0, len2 = 0;
char buffer[XBYTES * NUM_ROWS] = "\0";
static const char *blanks = " ";
uint16 index, len, len1 = 0, len2 = 0;
char buffer[XBYTES *NUM_ROWS] = "\0";
index = 0;
for (int i = 0; i < _vm._numObj; i++) /* Find widths of 2 columns */
@ -700,19 +699,20 @@ char buffer[XBYTES * NUM_ROWS] = "\0";
if (len1 + len2 < (uint16)strlen(_vm._textParser[kTBOutro]))
len1 = strlen(_vm._textParser[kTBOutro]);
strncat (buffer, blanks, (len1 + len2 - strlen(_vm._textParser[kTBIntro])) / 2);
strcat (strcat (buffer, _vm._textParser[kTBIntro]), "\n");
strncat(buffer, blanks, (len1 + len2 - strlen(_vm._textParser[kTBIntro])) / 2);
strcat(strcat(buffer, _vm._textParser[kTBIntro]), "\n");
index = 0;
for (int i = 0; i < _vm._numObj; i++) { /* Assign strings */
if (_vm._objects[i].carriedFl) {
if (index++ & 1)
strcat (strcat (buffer, _vm._arrayNouns[_vm._objects[i].nounIndex][1]), "\n");
strcat(strcat(buffer, _vm._arrayNouns[_vm._objects[i].nounIndex][1]), "\n");
else
strncat (strcat (buffer, _vm._arrayNouns[_vm._objects[i].nounIndex][1]), blanks, len1 - strlen(_vm._arrayNouns[_vm._objects[i].nounIndex][1]));
strncat(strcat(buffer, _vm._arrayNouns[_vm._objects[i].nounIndex][1]), blanks, len1 - strlen(_vm._arrayNouns[_vm._objects[i].nounIndex][1]));
}
}
if (index & 1) strcat (buffer, "\n");
strcat (buffer, _vm._textParser[kTBOutro]);
if (index & 1)
strcat(buffer, "\n");
strcat(buffer, _vm._textParser[kTBOutro]);
Utils::Box(BOX_ANY, buffer);
}