aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2012-12-04 21:36:53 +0100
committerStrangerke2012-12-04 21:36:53 +0100
commitf91b1f1129d6be7c70b63e63c0a60640d30a8d2c (patch)
treed2ace929166e390662f1727c89daf5d7057bac8a /engines
parent99f3442393145643678519076ffbd5c07fcbe4b2 (diff)
downloadscummvm-rg350-f91b1f1129d6be7c70b63e63c0a60640d30a8d2c.tar.gz
scummvm-rg350-f91b1f1129d6be7c70b63e63c0a60640d30a8d2c.tar.bz2
scummvm-rg350-f91b1f1129d6be7c70b63e63c0a60640d30a8d2c.zip
HOPKINS: Janitorials: remove some while(1)
Diffstat (limited to 'engines')
-rw-r--r--engines/hopkins/anim.cpp4
-rw-r--r--engines/hopkins/computer.cpp2
-rw-r--r--engines/hopkins/font.cpp4
-rw-r--r--engines/hopkins/graphics.cpp12
-rw-r--r--engines/hopkins/lines.cpp14
-rw-r--r--engines/hopkins/objects.cpp4
-rw-r--r--engines/hopkins/talk.cpp4
7 files changed, 22 insertions, 22 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 9cd97cf53a..97ec536b0b 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -332,7 +332,7 @@ void AnimationManager::PLAY_ANM2(const Common::String &filename, uint32 a2, uint
_vm->_soundManager.LOAD_ANM_SOUND();
if (_vm->_globals.iRegul != 1)
break;
- while (1) {
+ for (;;) {
if (_vm->_eventsManager.ESC_KEY == true)
goto LABEL_114;
if (REDRAW_ANIM() == true)
@@ -403,7 +403,7 @@ LABEL_48:
_vm->_eventsManager.lItCounter = 0;
v5 = 0;
v15 = 0;
- while (1) {
+ for (;;) {
++v15;
_vm->_soundManager.PLAY_ANM_SOUND(v15);
memset(&buf, 0, 6u);
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index 373c023c86..74c1c644bd 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -315,7 +315,7 @@ void ComputerManager::Charge_Menu() {
}
MenuText[lineNum]._actvFl = 1;
strPos = 0;
- while (1) {
+ for (;;) {
byte curChar = tmpPtr[strPos + 2];
if (curChar == '%' || curChar == 10)
break;
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 414d88e399..b5813f8163 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -217,7 +217,7 @@ void FontManager::BOITE(int idx, int messageId, const Common::String &filename,
v60 = texte_tmp;
if (v69) {
int v64 = 0;
- while (1) {
+ for (;;) {
byte v14 = *(v60 + v64);
if (v14 == '\r' || v14 == '\n') {
*(v60 + v64) = 0;
@@ -260,7 +260,7 @@ LABEL_43:
do {
int v19 = 0;
int ptrb = _vm->_globals.largeur_boite - 4;
- while (1) {
+ for (;;) {
lineSize = v19;
do
v11 = *(v61 + v65 + v19++);
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 697a57cdde..35a067cec5 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1874,7 +1874,7 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp
}
int v63;
do {
- while (1) {
+ for (;;) {
v63 = v22;
byte *v53 = v29;
v46 = spritePixelsP;
@@ -1882,7 +1882,7 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp
Agr_x = 0;
int v35 = v20;
do {
- while (1) {
+ for (;;) {
if (*spritePixelsP)
*v29 = *spritePixelsP;
--v29;
@@ -1956,7 +1956,7 @@ R_Aff_Zoom_Larg_Cont1:
int v60;
do {
- while (1) {
+ for (;;) {
v60 = v22;
byte *v51 = dest1P;
v45 = spritePixelsP;
@@ -1964,7 +1964,7 @@ R_Aff_Zoom_Larg_Cont1:
Agr_Flag_x = 0;
Agr_x = 0;
do {
- while (1) {
+ for (;;) {
if (*spritePixelsP)
*dest1P = *spritePixelsP;
++dest1P;
@@ -2415,7 +2415,7 @@ void GraphicsManager::Copy_WinScan_Vbe(const byte *src, byte *dest) {
result = 0;
destOffset = 0;
srcPtr = src;
- while (1) {
+ for (;;) {
byteVal = *srcPtr;
if (*srcPtr < kByteStop)
goto Video_Cont_wVbe;
@@ -2449,7 +2449,7 @@ void GraphicsManager::Copy_Video_Vbe(const byte *src) {
assert(VideoPtr);
destOffset = 0;
srcP = src;
- while (1) {
+ for (;;) {
byteVal = *srcP;
if (*srcP < kByteStop)
goto Video_Cont_Vbe;
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp
index 1d93096987..2aaa6adc63 100644
--- a/engines/hopkins/lines.cpp
+++ b/engines/hopkins/lines.cpp
@@ -392,7 +392,7 @@ LABEL_29:
int v20 = a2 + 4;
int v19 = a2 - 4;
int v17;
- while (1) {
+ for (;;) {
v7 = Ligne[v6].lineData;
if (v7 != (int16 *)g_PTRNUL) {
@@ -433,7 +433,7 @@ LABEL_28:
if (v24 >= a6 + 1)
goto LABEL_29;
}
- while (1) {
+ for (;;) {
int v12 = v7[0];
v13 = v7 + 1;
@@ -513,7 +513,7 @@ LABEL_46:
if (v24 >= a6 + 1)
goto LABEL_47;
}
- while (1) {
+ for (;;) {
int v12 = v7[0];
v13 = v7 + 1;
int v16 = v13[0];
@@ -1160,7 +1160,7 @@ LABEL_112:
int v92 = a1;
int v65;
- while (1) {
+ for (;;) {
int v86 = v92 - 1;
int v11 = 2 * Ligne[v92 - 1].field0;
@@ -1196,7 +1196,7 @@ LABEL_11:
if (v16 == (int16 *)g_PTRNUL)
break;
int v17;
- while (1) {
+ for (;;) {
v65 = v15;
v17 = v16[v15 - 2];
if (v16[0] == v95) {
@@ -2632,7 +2632,7 @@ LABEL_67:
v91 = SMOOTH_SENS;
v14 = 0;
int v16;
- while (1) {
+ for (;;) {
int v15 = SMOOTH[v14].field0;
v112 = v15;
v110 = SMOOTH[v14].field2;
@@ -2750,7 +2750,7 @@ LABEL_195:
goto LABEL_248;
}
v39 = v92;
- while (1) {
+ for (;;) {
if (colision2_ligne(a3, v39, &v141, &v140, 0, TOTAL_LIGNES) == 1) {
if (_vm->_objectsManager.DERLIGNE < v140) {
v40 = GENIAL(v140, v141, a3, v39, a3, a4, v117, _vm->_globals.essai1, 3);
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index c42feb7791..6951f48a6f 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2274,7 +2274,7 @@ void ObjectsManager::GOHOME2() {
v0 = 6;
_vm->_globals.j_104 = 0;
if (v0) {
- while (1) {
+ for (;;) {
nouveau_x = *_vm->_globals.chemin;
_vm->_globals.chemin++;
@@ -5348,7 +5348,7 @@ void ObjectsManager::SPACTION1(byte *a1, const Common::String &a2, int a3, int a
v13 = a5 / 2;
else if (_vm->_globals.vitesse == 3)
v13 = a5 / 3;
- while (1) {
+ for (;;) {
v6 = 0;
v7 = a2[v14];
if (v7 == 44) {
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index 6bb0110dc5..9bdaae155f 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -783,7 +783,7 @@ void TalkManager::CHERCHE_ANIM0(int a1, int a2) {
v2 = 0;
v3 = 0;
v4 = a1;
- while (1) {
+ for (;;) {
if (*(BUFFERPERSO + v4) == 'A'
&& *(BUFFERPERSO + v4 + 1) == 'N'
&& *(BUFFERPERSO + v4 + 2) == 'I'
@@ -990,7 +990,7 @@ LABEL_2:
v15 = 0;
if (_vm->_globals.COUCOU != g_PTRNUL) {
v5 = _vm->_globals.COUCOU;
- while (1) {
+ for (;;) {
if (*v5 == 'C') {
if (*(v5 + 1) == 'O') {
if (*(v5 + 2) == 'D') {