diff options
Diffstat (limited to 'engines/cruise')
| -rw-r--r-- | engines/cruise/background.cpp | 2 | ||||
| -rw-r--r-- | engines/cruise/cruise_main.cpp | 12 | ||||
| -rw-r--r-- | engines/cruise/mainDraw.cpp | 8 | ||||
| -rw-r--r-- | engines/cruise/script.cpp | 4 |
4 files changed, 3 insertions, 23 deletions
diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp index 1e7e87cf38..4d1284a802 100644 --- a/engines/cruise/background.cpp +++ b/engines/cruise/background.cpp @@ -212,7 +212,7 @@ int loadBackground(const char *name, int idx) { // NOTE: the following is really meant to compare pointers and not the actual // strings. See r48092 and r48094. if (name != backgroundTable[idx].name) { - if (strlen(name) >= sizeof(backgroundTable[idx].name)) + if (strlen(name) >= sizeof(backgroundTable[idx].name)) warning("background name length exceeded allowable maximum"); Common::strlcpy(backgroundTable[idx].name, name, sizeof(backgroundTable[idx].name)); diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index 3f13c6cbff..031c53b96a 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -902,18 +902,8 @@ bool createDialog(int objOvl, int objIdx, int x, int y) { if (!obj2Ovl) obj2Ovl = j; char verbe_name[80]; - char obj1_name[80]; - char obj2_name[80]; - char r_verbe_name[80]; - char r_obj1_name[80]; - char r_obj2_name[80]; verbe_name[0] = 0; - obj1_name[0] = 0; - obj2_name[0] = 0; - r_verbe_name[0] = 0; - r_obj1_name[0] = 0; - r_obj2_name[0] = 0; ovlDataStruct *ovl2 = NULL; ovlDataStruct *ovl3 = NULL; @@ -1882,7 +1872,7 @@ void CruiseEngine::mainLoop() { while (numIterations-- > 0) { bgChanged = backgroundChanged[masterScreen]; - + manageScripts(&relHead); manageScripts(&procHead); diff --git a/engines/cruise/mainDraw.cpp b/engines/cruise/mainDraw.cpp index 814d0aa9e9..14b6daf4bb 100644 --- a/engines/cruise/mainDraw.cpp +++ b/engines/cruise/mainDraw.cpp @@ -440,7 +440,6 @@ void buildSegment() { // is segment on screen ? if (!((tempAX > 199) || (tempDX < 0))) { - int dx = Y1; int cx = X2 - X1; if (cx == 0) { // vertical line @@ -473,7 +472,6 @@ void buildSegment() { } else { if (cx < 0) { cx = -cx; - dx = Y2; SWAP(X1, X2); SWAP(Y1, Y2); @@ -1490,9 +1488,6 @@ void mainDraw(int16 param) { if (currentObjPtr->animLoop > 0) currentObjPtr->animLoop--; } else { - int16 data2; - data2 = currentObjPtr->animStart; - change = false; currentObjPtr->animStep = 0; @@ -1512,9 +1507,6 @@ void mainDraw(int16 param) { if (currentObjPtr->animLoop > 0) currentObjPtr->animLoop--; } else { - int16 data2; - data2 = currentObjPtr->animStart; - change = false; currentObjPtr->animStep = 0; diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index 4e76194a45..cf28548e7d 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -231,9 +231,7 @@ int32 opcodeType2() { int type = getByteFromScript(); int overlay = getByteFromScript(); - int firstOffset; - int offset; - firstOffset = offset = getShortFromScript(); + int offset = getShortFromScript(); offset += index; int typ7 = type & 7; |