From 9d349e794e272b6e7d8fe1655b7cc3bfa2253efb Mon Sep 17 00:00:00 2001 From: yinsimei Date: Tue, 11 Jul 2017 00:07:40 +0200 Subject: SLUDGE: code formatting for ** --- engines/sludge/bg_effects.cpp | 8 ++++---- engines/sludge/builtin.cpp | 4 ++-- engines/sludge/floor.cpp | 2 +- engines/sludge/floor.h | 2 +- engines/sludge/loadsave.cpp | 2 +- engines/sludge/newfatal.cpp | 2 +- engines/sludge/objtypes.cpp | 2 +- engines/sludge/people.cpp | 10 +++++----- engines/sludge/people.h | 2 +- engines/sludge/region.cpp | 4 ++-- engines/sludge/sludger.cpp | 8 ++++---- engines/sludge/statusba.cpp | 2 +- engines/sludge/talk.cpp | 2 +- engines/sludge/variable.cpp | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) (limited to 'engines') diff --git a/engines/sludge/bg_effects.cpp b/engines/sludge/bg_effects.cpp index 916c8e3248..40f60e3b1d 100644 --- a/engines/sludge/bg_effects.cpp +++ b/engines/sludge/bg_effects.cpp @@ -32,7 +32,7 @@ namespace Sludge { #if 0 -//extern uint16 * * backDropImage; +//extern uint16 **backDropImage; extern GLuint backdropTextureName; #endif @@ -333,9 +333,9 @@ bool blurScreen() { byte *pixel = &sourceLine[miniY][x * 4]; for (int miniX = 0; miniX < s_matrixEffectWidth; ++miniX) { - totalRed += pixel[0] * *matrixElement; - totalGreen += pixel[1] * *matrixElement; - totalBlue += pixel[2] * *matrixElement; + totalRed += pixel[0] **matrixElement; + totalGreen += pixel[1] **matrixElement; + totalBlue += pixel[2] **matrixElement; ++matrixElement; pixel += 4; } diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp index 1226b1a0f0..3a79590420 100644 --- a/engines/sludge/builtin.cpp +++ b/engines/sludge/builtin.cpp @@ -76,8 +76,8 @@ extern uint sceneWidth, sceneHeight; extern int numBIFNames, numUserFunc; extern char builtInFunctionNames[][25]; -extern char * *allUserFunc; -extern char * *allBIFNames; +extern char **allUserFunc; +extern char **allBIFNames; extern inputType input; extern char *loadNow; diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp index 15da333def..591a5ff321 100644 --- a/engines/sludge/floor.cpp +++ b/engines/sludge/floor.cpp @@ -174,7 +174,7 @@ bool setFloor(int fileNum) { // Now build the movement martix currentFloor->matrix = new int *[currentFloor->numPolygons]; - int * * distanceMatrix = new int *[currentFloor->numPolygons]; + int **distanceMatrix = new int *[currentFloor->numPolygons]; if (!checkNew(currentFloor->matrix)) return false; diff --git a/engines/sludge/floor.h b/engines/sludge/floor.h index b1de826f9d..c543c3f76d 100644 --- a/engines/sludge/floor.h +++ b/engines/sludge/floor.h @@ -36,7 +36,7 @@ struct flor { Common::Point *vertex; int numPolygons; floorPolygon *polygon; - int * *matrix; + int **matrix; }; bool initFloor(); diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp index e735d60049..893d2a8def 100644 --- a/engines/sludge/loadsave.cpp +++ b/engines/sludge/loadsave.cpp @@ -122,7 +122,7 @@ variableStack *loadStack(Common::SeekableReadStream *stream, variableStack **las int elements = stream->readUint16BE(); int a; variableStack *first = NULL; - variableStack * * changeMe = &first; + variableStack **changeMe = &first; for (a = 0; a < elements; a++) { variableStack *nS = new variableStack; diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp index d0e5184ef5..52234002b4 100644 --- a/engines/sludge/newfatal.cpp +++ b/engines/sludge/newfatal.cpp @@ -38,7 +38,7 @@ static Common::String fatalMessage; static Common::String fatalInfo = "Initialisation error! Something went wrong before we even got started!"; extern int numResourceNames /* = 0*/; -extern char * *allResourceNames /*= NULL*/; +extern char **allResourceNames /*= NULL*/; int resourceForFatal = -1; diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp index ebb9056cc8..ddb7553cf4 100644 --- a/engines/sludge/objtypes.cpp +++ b/engines/sludge/objtypes.cpp @@ -157,7 +157,7 @@ int getCombinationFunction(int withThis, int thisObject) { } void removeObjectType(objectType *oT) { - objectType * * huntRegion = &allObjectTypes; + objectType **huntRegion = &allObjectTypes; while (*huntRegion) { if ((*huntRegion) == oT) { diff --git a/engines/sludge/people.cpp b/engines/sludge/people.cpp index dca541bc91..1fd6931b6f 100644 --- a/engines/sludge/people.cpp +++ b/engines/sludge/people.cpp @@ -415,7 +415,7 @@ void setPersonColourise(int ob, byte r, byte g, byte b, byte colourmix) { extern screenRegion *overRegion; void shufflePeople() { - onScreenPerson * * thisReference = &allPeople; + onScreenPerson **thisReference = &allPeople; onScreenPerson *A, *B; if (!allPeople) @@ -855,7 +855,7 @@ bool addPerson(int x, int y, int objNum, persona *p) { } // NOW ADD IT IN THE RIGHT PLACE - onScreenPerson * * changethat = &allPeople; + onScreenPerson **changethat = &allPeople; while (((*changethat) != NULL) && ((*changethat)->y < y)) changethat = &((*changethat)->next); @@ -918,7 +918,7 @@ void killAllPeople() { void killMostPeople() { onScreenPerson *killPeople; - onScreenPerson * * lookyHere = &allPeople; + onScreenPerson **lookyHere = &allPeople; while (*lookyHere) { if ((*lookyHere)->extra & EXTRA_NOREMOVE) { @@ -950,7 +950,7 @@ void removeOneCharacter(int i) { if (p->continueAfterWalking) abortFunction(p->continueAfterWalking); p->continueAfterWalking = NULL; - onScreenPerson * * killPeople; + onScreenPerson **killPeople; for (killPeople = &allPeople; *killPeople != p; killPeople = &((*killPeople)->next)) { ; @@ -1113,7 +1113,7 @@ bool savePeople(Common::WriteStream *stream) { } bool loadPeople(Common::SeekableReadStream *stream) { - onScreenPerson * * pointy = &allPeople; + onScreenPerson **pointy = &allPeople; onScreenPerson *me; scaleHorizon = stream->readSint16LE(); diff --git a/engines/sludge/people.h b/engines/sludge/people.h index b02bc1c490..eb19e4fd53 100644 --- a/engines/sludge/people.h +++ b/engines/sludge/people.h @@ -47,7 +47,7 @@ struct personaAnimation { }; struct persona { - personaAnimation * *animation; + personaAnimation **animation; int numDirections; }; diff --git a/engines/sludge/region.cpp b/engines/sludge/region.cpp index c6fa06ec21..e43cd579e9 100644 --- a/engines/sludge/region.cpp +++ b/engines/sludge/region.cpp @@ -48,7 +48,7 @@ void showBoxes() { } void removeScreenRegion(int objectNum) { - screenRegion ** huntRegion = &allScreenRegions; + screenRegion **huntRegion = &allScreenRegions; screenRegion *killMe; while (*huntRegion) { @@ -93,7 +93,7 @@ void loadRegions(Common::SeekableReadStream *stream) { int numRegions = stream->readUint16BE(); screenRegion *newRegion; - screenRegion * * pointy = &allScreenRegions; + screenRegion **pointy = &allScreenRegions; while (numRegions--) { newRegion = new screenRegion; diff --git a/engines/sludge/sludger.cpp b/engines/sludge/sludger.cpp index a4ae34d627..5c5e6c66f2 100644 --- a/engines/sludge/sludger.cpp +++ b/engines/sludge/sludger.cpp @@ -65,11 +65,11 @@ extern bool reallyWantToQuit; extern Graphics::Surface renderSurface; int numBIFNames = 0; -char * *allBIFNames = NULL; +char **allBIFNames = NULL; int numUserFunc = 0; -char * *allUserFunc = NULL; +char **allUserFunc = NULL; int numResourceNames = 0; -char * *allResourceNames = NULL; +char **allResourceNames = NULL; int selectedLanguage = 0; int languageNum = -1; @@ -585,7 +585,7 @@ void sludgeDisplay() { } void pauseFunction(loadedFunction *fun) { - loadedFunction * * huntAndDestroy = &allRunningFunctions; + loadedFunction **huntAndDestroy = &allRunningFunctions; while (*huntAndDestroy) { if (fun == *huntAndDestroy) { (*huntAndDestroy) = (*huntAndDestroy)->next; diff --git a/engines/sludge/statusba.cpp b/engines/sludge/statusba.cpp index 577e82b64a..2f1eb6fc15 100644 --- a/engines/sludge/statusba.cpp +++ b/engines/sludge/statusba.cpp @@ -216,7 +216,7 @@ bool loadStatusBars(Common::SeekableReadStream *stream) { setFontColour(verbLinePalette, nowStatus->statusR, nowStatus->statusG, nowStatus->statusB); setFontColour(litVerbLinePalette, nowStatus->statusLR, nowStatus->statusLG, nowStatus->statusLB); // Read what's being said - statusBar * * viewLine = & (nowStatus->firstStatusBar); + statusBar **viewLine = & (nowStatus->firstStatusBar); statusBar *newOne; while (stream->readByte()) { newOne = new statusBar; diff --git a/engines/sludge/talk.cpp b/engines/sludge/talk.cpp index 12f6d8e151..d72db2c218 100644 --- a/engines/sludge/talk.cpp +++ b/engines/sludge/talk.cpp @@ -263,7 +263,7 @@ bool loadSpeech(speechStruct *sS, Common::SeekableReadStream *stream) { } // Read what's being said - speechLine * * viewLine = &sS->allSpeech; + speechLine **viewLine = &sS->allSpeech; speechLine *newOne; speech->lastFile = -1; while (stream->readByte()) { diff --git a/engines/sludge/variable.cpp b/engines/sludge/variable.cpp index 30686e4b51..eee9d07e1a 100644 --- a/engines/sludge/variable.cpp +++ b/engines/sludge/variable.cpp @@ -555,7 +555,7 @@ variable *stackGetByIndex(variableStack *vS, uint theIndex) { } int deleteVarFromStack(const variable &va, variableStack *&thisStack, bool allOfEm) { - variableStack * * huntVar = &thisStack; + variableStack **huntVar = &thisStack; variableStack *killMe; int reply = 0; -- cgit v1.2.3