Skip to content

Commit

Permalink
JANITORIAL: Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
DrMcCoy committed Jul 14, 2013
1 parent 6e4217e commit 989ea7c
Show file tree
Hide file tree
Showing 137 changed files with 1,279 additions and 1,279 deletions.
2 changes: 1 addition & 1 deletion audio/softsynth/fluidsynth.cpp
Expand Up @@ -163,7 +163,7 @@ int MidiDriver_FluidSynth::open() {

Common::String interpolation = ConfMan.get("fluidsynth_misc_interpolation");
int interpMethod = FLUID_INTERP_4THORDER;

if (interpolation == "none") {
interpMethod = FLUID_INTERP_NONE;
} else if (interpolation == "linear") {
Expand Down
2 changes: 1 addition & 1 deletion backends/graphics/surfacesdl/surfacesdl-graphics.cpp
Expand Up @@ -773,7 +773,7 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {

if (_displayDisabled) {
_hwscreen = g_eventRec.getSurface(_videoMode.hardwareWidth, _videoMode.hardwareHeight);
} else
} else
#endif
{
_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 16,
Expand Down
6 changes: 3 additions & 3 deletions backends/platform/tizen/form.cpp
Expand Up @@ -316,16 +316,16 @@ void TizenAppForm::invokeShortcut() {
case kControlMouse:
setButtonShortcut();
break;

case kEscapeKey:
pushKey(Common::KEYCODE_ESCAPE);
break;

case kGameMenu:
_buttonState = kLeftButton;
pushKey(Common::KEYCODE_F5);
break;

case kShowKeypad:
showKeypad();
break;
Expand Down
2 changes: 1 addition & 1 deletion common/winexe_ne.cpp
Expand Up @@ -231,7 +231,7 @@ bool NEResources::readResourceTable(uint32 offset) {
if (id & 0x8000)
res.id = id & 0x7FFF;
else
res.id = getResourceString(*_exe, offset + id);
res.id = getResourceString(*_exe, offset + id);

if (typeID & 0x8000 && ((typeID & 0x7FFF) < ARRAYSIZE(s_resTypeNames)) && s_resTypeNames[typeID & 0x7FFF][0] != 0)
debug(2, "Found resource %s %s", s_resTypeNames[typeID & 0x7FFF], res.id.toString().c_str());
Expand Down
74 changes: 37 additions & 37 deletions devtools/create_neverhood/create_neverhood.cpp
Expand Up @@ -69,13 +69,13 @@ bool loadExe(const char *filename) {

bool validateMd5() {
uint8 digest[16];

md5_buffer(data, dataSize, digest);

printf("MD5 of nhc.exe is %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], digest[7],
digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], digest[7],
digest[8], digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], digest[15]);

if (memcmp(kNhcExeMd5, digest, 16)) {
printf("MD5 hash of nhc.exe doesn't match the expected value! Quitting...\n");
return false;
Expand Down Expand Up @@ -112,15 +112,15 @@ uint32 calcHash(const char *value) {
struct HitRect {
int16 x1, y1, x2, y2;
uint16 messageNum;

void load(uint32 offset) {
byte *item = getData(offset);
x1 = READ_LE_UINT16(item + 0);
y1 = READ_LE_UINT16(item + 2);
x2 = READ_LE_UINT16(item + 4);
y2 = READ_LE_UINT16(item + 6);
messageNum = READ_LE_UINT16(item + 8);
}
}

void save(FILE *fd) {
writeUint16LE(fd, x1);
Expand All @@ -129,34 +129,34 @@ struct HitRect {
writeUint16LE(fd, y2);
writeUint16LE(fd, messageNum);
}

int getItemSize() const {
return 10;
}

};

struct MessageItem {
uint16 messageNum;
uint32 messageParam;
MessageItem() {}
MessageItem(uint16 msgNum, uint32 msgParam) : messageNum(msgNum), messageParam(msgParam) {}

void load(uint32 offset) {
byte *item = getData(offset);
messageNum = READ_LE_UINT16(item + 0);
messageParam = READ_LE_UINT32(item + 4);
}
}

void save(FILE *fd) {
writeUint16LE(fd, messageNum);
writeUint32LE(fd, messageParam);
}

int getItemSize() const {
return 8;
}

};

struct SubRectItem {
Expand All @@ -175,19 +175,19 @@ struct SubRectItem {
// Add the message to the message list
addMessageList(messageListCount, messageListOffset);
}

void save(FILE *fd) {
writeUint16LE(fd, x1);
writeUint16LE(fd, y1);
writeUint16LE(fd, x2);
writeUint16LE(fd, y2);
writeUint32LE(fd, messageListOffset);
}

int getItemSize() const {
return 16;
}

};

struct RectItem {
Expand All @@ -212,7 +212,7 @@ struct RectItem {
subItemOffset += 16;
subRectItems.push_back(subRectItem);
}
}
}

void save(FILE *fd) {
writeUint16LE(fd, x1);
Expand All @@ -223,11 +223,11 @@ struct RectItem {
for (uint32 j = 0; j < subRectItems.size(); j++)
subRectItems[j].save(fd);
}

int getItemSize() const {
return 16;
}

};

struct NavigationItem {
Expand All @@ -238,10 +238,10 @@ struct NavigationItem {
byte interactive;
byte middleFlag;
uint32 mouseCursorFileHash;

void load(uint32 offset) {
byte *item = getData(offset);
fileHash = READ_LE_UINT32(item + 0);
fileHash = READ_LE_UINT32(item + 0);
leftSmackerFileHash = READ_LE_UINT32(item + 4);
rightSmackerFileHash = READ_LE_UINT32(item + 8);
middleSmackerFileHash = READ_LE_UINT32(item + 12);
Expand All @@ -263,7 +263,7 @@ struct NavigationItem {
int getItemSize() const {
return 24;
}

};

struct SceneInfo140Item {
Expand Down Expand Up @@ -347,24 +347,24 @@ struct SceneInfo2700Item {
template<class ITEMCLASS>
class StaticDataList {
public:
uint32 id;
uint32 id;
std::vector<ITEMCLASS> items;

virtual ~StaticDataList() {
}

void add(ITEMCLASS item) {
items.push_back(item);
}

int getCount() const {
return items.size();
}

ITEMCLASS *getListItem(int index) {
return &items[index];
}

virtual bool specialLoadList(uint32 count, uint32 offset) {
return false;
}
Expand Down Expand Up @@ -398,7 +398,7 @@ class RectList : public StaticDataList<RectItem> {
};

class MessageList : public StaticDataList<MessageItem> {
public:
public:

virtual bool specialLoadList(uint32 count, uint32 offset) {
// Special code for message lists which are set at runtime (but otherwise constant)
Expand Down Expand Up @@ -455,7 +455,7 @@ class MessageList : public StaticDataList<MessageItem> {
}
return false;
}

};

class NavigationList : public StaticDataList<NavigationItem> {
Expand All @@ -465,11 +465,11 @@ template<class LISTCLASS>
class StaticDataListVector {
public:
std::vector<LISTCLASS*> lists;

void add(LISTCLASS *list) {
lists.push_back(list);
}

void loadListVector(const uint32 *offsets) {
for (int i = 0; offsets[i] != 0; i += 2) {
LISTCLASS *list = new LISTCLASS();
Expand All @@ -486,7 +486,7 @@ class StaticDataListVector {
lists.push_back(list);
}
}

void saveListVector(FILE *fd) {
writeUint32LE(fd, lists.size());
for (typename std::vector<LISTCLASS*>::iterator it = lists.begin(); it != lists.end(); it++) {
Expand All @@ -500,15 +500,15 @@ template<class ITEMCLASS>
class StaticDataVector {
public:
std::vector<ITEMCLASS> items;

void loadVector(const uint32 *offsets) {
for (int i = 0; offsets[i] != 0; i++) {
ITEMCLASS item;
item.load(offsets[i]);
items.push_back(item);
}
}

void saveVector(FILE *fd) {
writeUint32LE(fd, items.size());
for (typename std::vector<ITEMCLASS>::iterator it = items.begin(); it != items.end(); it++) {
Expand All @@ -522,8 +522,8 @@ StaticDataListVector<HitRectList> hitRectLists;
StaticDataListVector<RectList> rectLists;
StaticDataListVector<MessageList> messageLists;
StaticDataListVector<NavigationList> navigationLists;
StaticDataVector<SceneInfo140Item> sceneInfo140Items;
StaticDataVector<SceneInfo2700Item> sceneInfo2700Items;
StaticDataVector<SceneInfo140Item> sceneInfo140Items;
StaticDataVector<SceneInfo2700Item> sceneInfo2700Items;

void addMessageList(uint32 messageListCount, uint32 messageListOffset) {
MessageList *messageList = new MessageList();
Expand All @@ -550,7 +550,7 @@ int main(int argc, char *argv[]) {

writeUint32LE(datFile, 0x11223344); // Some magic
writeUint32LE(datFile, DAT_VERSION);

messageLists.saveListVector(datFile);
rectLists.saveListVector(datFile);
hitRectLists.saveListVector(datFile);
Expand Down
2 changes: 1 addition & 1 deletion devtools/create_neverhood/tables.h
Expand Up @@ -122,7 +122,7 @@ static const uint32 rectListOffsets[] = {
// Scene2406
1, 0x004B78C8,
1, 0x004B78D8,
// Scene2501
// Scene2501
1, 0x004B2608,
// Scene2732
1, 0x004AE360,
Expand Down
2 changes: 1 addition & 1 deletion devtools/create_teenagent/static_tables.h
Expand Up @@ -15148,7 +15148,7 @@ const static char* dialog_162[] = {
};

// Note:
// The usage of this in the engine overlaps the previous dialog i.e. the
// The usage of this in the engine overlaps the previous dialog i.e. the
// starting offset used is two bytes early, thus implicitly changing the
// first command of this dialog from NEW_LINE to CHANGE_CHARACTER.
const static char* dialog_163[] = {
Expand Down
4 changes: 2 additions & 2 deletions engines/agi/agi.cpp
Expand Up @@ -598,8 +598,8 @@ AgiEngine::AgiEngine(OSystem *syst, const AGIGameDescription *gameDesc) : AgiBas
_console = NULL;

_egoHoldKey = false;


}

void AgiEngine::initialize() {
Expand Down
2 changes: 1 addition & 1 deletion engines/cge/detection.cpp
Expand Up @@ -121,7 +121,7 @@ static const CgeGameDescription gameDescriptions[] = {
"sfinx", "Sfinx Freeware",
{
{"vol.cat", 0, "21197b287d397c53261b6616bf0dd880", 129024},
{"vol.dat", 0, "de14291869a8eb7c2732ab783c7542ef", 34180844},
{"vol.dat", 0, "de14291869a8eb7c2732ab783c7542ef", 34180844},
AD_LISTEND
},
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO0()
Expand Down
2 changes: 1 addition & 1 deletion engines/cge/snail.cpp
Expand Up @@ -494,7 +494,7 @@ void CGEEngine::snGame(Sprite *spr, int num) {
_sprK3->step(newRandom(6));

// check the ALT key as it's the solution of the puzzle
// the test has been restricted to some specific OSes
// the test has been restricted to some specific OSes
// in order to avoid some obvious issues (like Android, iOS, NDS, N64...)
// Not perfect, but at least better than nothing.
#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(MOTOEZX) || defined(LINUPY) || defined(LINUXMOTO_SDL)
Expand Down
2 changes: 1 addition & 1 deletion engines/drascula/drascula.h
Expand Up @@ -661,7 +661,7 @@ class DrasculaEngine : public Engine {
void animation_3_1(); // John talks with the bartender to book a room
void animation_4_1(); // John talks with the pianist
//
void animation_2_2(); // John enters the chapel via the window
void animation_2_2(); // John enters the chapel via the window
void animation_4_2(); // John talks with the blind man (closeup)
void animation_5_2(); // John breaks the chapel window with the pike
void animation_6_2(); // The blind man (closeup) thanks John for giving him money and hands him the sickle
Expand Down

0 comments on commit 989ea7c

Please sign in to comment.