thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SLUDGE: code formatting for **

Browse source
This commit is contained in:
yinsimei 2017-07-11 00:07:40 +02:00 • committed by Eugene Sandulenko
parent 38262ad630
commit 9d349e794e
14 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/sludge/bg_effects.cpp
View file

@ -32,7 +32,7 @@
namespace Sludge { namespace Sludge {
#if 0 #if 0
//extern uint16 * * backDropImage; //extern uint16 **backDropImage;
extern GLuint backdropTextureName; extern GLuint backdropTextureName;
#endif #endif
@ -333,9 +333,9 @@ bool blurScreen() {
byte *pixel = &sourceLine[miniY][x * 4]; byte *pixel = &sourceLine[miniY][x * 4];
for (int miniX = 0; miniX < s_matrixEffectWidth; ++miniX) { for (int miniX = 0; miniX < s_matrixEffectWidth; ++miniX) {
totalRed += pixel[0] * *matrixElement; totalRed += pixel[0] **matrixElement;
totalGreen += pixel[1] * *matrixElement; totalGreen += pixel[1] **matrixElement;
totalBlue += pixel[2] * *matrixElement; totalBlue += pixel[2] **matrixElement;
++matrixElement; ++matrixElement;
pixel += 4; pixel += 4;
} }

4
engines/sludge/builtin.cpp
View file

@ -76,8 +76,8 @@ extern uint sceneWidth, sceneHeight;
extern int numBIFNames, numUserFunc; extern int numBIFNames, numUserFunc;
extern char builtInFunctionNames[][25]; extern char builtInFunctionNames[][25];
extern char * *allUserFunc; extern char **allUserFunc;
extern char * *allBIFNames; extern char **allBIFNames;
extern inputType input; extern inputType input;
extern char *loadNow; extern char *loadNow;

2
engines/sludge/floor.cpp
View file

@ -174,7 +174,7 @@ bool setFloor(int fileNum) {
// Now build the movement martix // Now build the movement martix
currentFloor->matrix = new int *[currentFloor->numPolygons]; currentFloor->matrix = new int *[currentFloor->numPolygons];
int * * distanceMatrix = new int *[currentFloor->numPolygons]; int **distanceMatrix = new int *[currentFloor->numPolygons];
if (!checkNew(currentFloor->matrix)) if (!checkNew(currentFloor->matrix))
return false; return false;

2
engines/sludge/floor.h
View file

@ -36,7 +36,7 @@ struct flor {
Common::Point *vertex; Common::Point *vertex;
int numPolygons; int numPolygons;
floorPolygon *polygon; floorPolygon *polygon;
int * *matrix; int **matrix;
}; };
bool initFloor(); bool initFloor();

2
engines/sludge/loadsave.cpp
View file

@ -122,7 +122,7 @@ variableStack *loadStack(Common::SeekableReadStream *stream, variableStack **las
int elements = stream->readUint16BE(); int elements = stream->readUint16BE();
int a; int a;
variableStack *first = NULL; variableStack *first = NULL;
variableStack * * changeMe = &first; variableStack **changeMe = &first;
for (a = 0; a < elements; a++) { for (a = 0; a < elements; a++) {
variableStack *nS = new variableStack; variableStack *nS = new variableStack;

2
engines/sludge/newfatal.cpp
View file

@ -38,7 +38,7 @@ static Common::String fatalMessage;
static Common::String fatalInfo = "Initialisation error! Something went wrong before we even got started!"; static Common::String fatalInfo = "Initialisation error! Something went wrong before we even got started!";
extern int numResourceNames /* = 0*/; extern int numResourceNames /* = 0*/;
extern char * *allResourceNames /*= NULL*/; extern char **allResourceNames /*= NULL*/;
int resourceForFatal = -1; int resourceForFatal = -1;

2
engines/sludge/objtypes.cpp
View file

@ -157,7 +157,7 @@ int getCombinationFunction(int withThis, int thisObject) {
} }
void removeObjectType(objectType *oT) { void removeObjectType(objectType *oT) {
objectType * * huntRegion = &allObjectTypes; objectType **huntRegion = &allObjectTypes;
while (*huntRegion) { while (*huntRegion) {
if ((*huntRegion) == oT) { if ((*huntRegion) == oT) {

10
engines/sludge/people.cpp
View file

@ -415,7 +415,7 @@ void setPersonColourise(int ob, byte r, byte g, byte b, byte colourmix) {
extern screenRegion *overRegion; extern screenRegion *overRegion;
void shufflePeople() { void shufflePeople() {
onScreenPerson * * thisReference = &allPeople; onScreenPerson **thisReference = &allPeople;
onScreenPerson *A, *B; onScreenPerson *A, *B;
if (!allPeople) if (!allPeople)
@ -855,7 +855,7 @@ bool addPerson(int x, int y, int objNum, persona *p) {
} }
// NOW ADD IT IN THE RIGHT PLACE // NOW ADD IT IN THE RIGHT PLACE
onScreenPerson * * changethat = &allPeople; onScreenPerson **changethat = &allPeople;
while (((*changethat) != NULL) && ((*changethat)->y < y)) while (((*changethat) != NULL) && ((*changethat)->y < y))
changethat = &((*changethat)->next); changethat = &((*changethat)->next);
@ -918,7 +918,7 @@ void killAllPeople() {
void killMostPeople() { void killMostPeople() {
onScreenPerson *killPeople; onScreenPerson *killPeople;
onScreenPerson * * lookyHere = &allPeople; onScreenPerson **lookyHere = &allPeople;
while (*lookyHere) { while (*lookyHere) {
if ((*lookyHere)->extra & EXTRA_NOREMOVE) { if ((*lookyHere)->extra & EXTRA_NOREMOVE) {
@ -950,7 +950,7 @@ void removeOneCharacter(int i) {
if (p->continueAfterWalking) if (p->continueAfterWalking)
abortFunction(p->continueAfterWalking); abortFunction(p->continueAfterWalking);
p->continueAfterWalking = NULL; p->continueAfterWalking = NULL;
onScreenPerson * * killPeople; onScreenPerson **killPeople;
for (killPeople = &allPeople; *killPeople != p; killPeople = &((*killPeople)->next)) { for (killPeople = &allPeople; *killPeople != p; killPeople = &((*killPeople)->next)) {
; ;
@ -1113,7 +1113,7 @@ bool savePeople(Common::WriteStream *stream) {
} }
bool loadPeople(Common::SeekableReadStream *stream) { bool loadPeople(Common::SeekableReadStream *stream) {
onScreenPerson * * pointy = &allPeople; onScreenPerson **pointy = &allPeople;
onScreenPerson *me; onScreenPerson *me;
scaleHorizon = stream->readSint16LE(); scaleHorizon = stream->readSint16LE();

2
engines/sludge/people.h
View file

@ -47,7 +47,7 @@ struct personaAnimation {
}; };
struct persona { struct persona {
personaAnimation * *animation; personaAnimation **animation;
int numDirections; int numDirections;
}; };

4
engines/sludge/region.cpp
View file

@ -48,7 +48,7 @@ void showBoxes() {
} }
void removeScreenRegion(int objectNum) { void removeScreenRegion(int objectNum) {
screenRegion ** huntRegion = &allScreenRegions; screenRegion **huntRegion = &allScreenRegions;
screenRegion *killMe; screenRegion *killMe;
while (*huntRegion) { while (*huntRegion) {
@ -93,7 +93,7 @@ void loadRegions(Common::SeekableReadStream *stream) {
int numRegions = stream->readUint16BE(); int numRegions = stream->readUint16BE();
screenRegion *newRegion; screenRegion *newRegion;
screenRegion * * pointy = &allScreenRegions; screenRegion **pointy = &allScreenRegions;
while (numRegions--) { while (numRegions--) {
newRegion = new screenRegion; newRegion = new screenRegion;

8
engines/sludge/sludger.cpp
View file

@ -65,11 +65,11 @@ extern bool reallyWantToQuit;
extern Graphics::Surface renderSurface; extern Graphics::Surface renderSurface;
int numBIFNames = 0; int numBIFNames = 0;
char * *allBIFNames = NULL; char **allBIFNames = NULL;
int numUserFunc = 0; int numUserFunc = 0;
char * *allUserFunc = NULL; char **allUserFunc = NULL;
int numResourceNames = 0; int numResourceNames = 0;
char * *allResourceNames = NULL; char **allResourceNames = NULL;
int selectedLanguage = 0; int selectedLanguage = 0;
int languageNum = -1; int languageNum = -1;
@ -585,7 +585,7 @@ void sludgeDisplay() {
} }
void pauseFunction(loadedFunction *fun) { void pauseFunction(loadedFunction *fun) {
loadedFunction * * huntAndDestroy = &allRunningFunctions; loadedFunction **huntAndDestroy = &allRunningFunctions;
while (*huntAndDestroy) { while (*huntAndDestroy) {
if (fun == *huntAndDestroy) { if (fun == *huntAndDestroy) {
(*huntAndDestroy) = (*huntAndDestroy)->next; (*huntAndDestroy) = (*huntAndDestroy)->next;

2
engines/sludge/statusba.cpp
View file

@ -216,7 +216,7 @@ bool loadStatusBars(Common::SeekableReadStream *stream) {
setFontColour(verbLinePalette, nowStatus->statusR, nowStatus->statusG, nowStatus->statusB); setFontColour(verbLinePalette, nowStatus->statusR, nowStatus->statusG, nowStatus->statusB);
setFontColour(litVerbLinePalette, nowStatus->statusLR, nowStatus->statusLG, nowStatus->statusLB); setFontColour(litVerbLinePalette, nowStatus->statusLR, nowStatus->statusLG, nowStatus->statusLB);
// Read what's being said // Read what's being said
statusBar * * viewLine = & (nowStatus->firstStatusBar); statusBar **viewLine = & (nowStatus->firstStatusBar);
statusBar *newOne; statusBar *newOne;
while (stream->readByte()) { while (stream->readByte()) {
newOne = new statusBar; newOne = new statusBar;

2
engines/sludge/talk.cpp
View file

@ -263,7 +263,7 @@ bool loadSpeech(speechStruct *sS, Common::SeekableReadStream *stream) {
} }
// Read what's being said // Read what's being said
speechLine * * viewLine = &sS->allSpeech; speechLine **viewLine = &sS->allSpeech;
speechLine *newOne; speechLine *newOne;
speech->lastFile = -1; speech->lastFile = -1;
while (stream->readByte()) { while (stream->readByte()) {

2
engines/sludge/variable.cpp
View file

@ -555,7 +555,7 @@ variable *stackGetByIndex(variableStack *vS, uint theIndex) {
} }
int deleteVarFromStack(const variable &va, variableStack *&thisStack, bool allOfEm) { int deleteVarFromStack(const variable &va, variableStack *&thisStack, bool allOfEm) {
variableStack * * huntVar = &thisStack; variableStack **huntVar = &thisStack;
variableStack *killMe; variableStack *killMe;
int reply = 0; int reply = 0;