[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.58,1.59 insane_ben.cpp,1.24,1.25 insane_enemy.cpp,1.18,1.19 insane_scenes.cpp,1.27,1.28
Max Horn
fingolfin at users.sourceforge.net
Sun May 8 14:20:05 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm/insane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21336
Modified Files:
insane.cpp insane_ben.cpp insane_enemy.cpp insane_scenes.cpp
Log Message:
Comply with our coding conventions
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- insane.cpp 7 May 2005 01:52:09 -0000 1.58
+++ insane.cpp 8 May 2005 21:18:27 -0000 1.59
@@ -767,7 +767,7 @@
_needSceneSwitch = false;
loadSceneData(_temp2SceneId, 0, 1);
- if(loadSceneData(_temp2SceneId, 0, 2)) {
+ if (loadSceneData(_temp2SceneId, 0, 2)) {
setSceneCostumes(_temp2SceneId);
_sceneData2Loaded = 0;
_sceneData1Loaded = 0;
Index: insane_ben.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_ben.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- insane_ben.cpp 20 Apr 2005 18:21:28 -0000 1.24
+++ insane_ben.cpp 8 May 2005 21:18:36 -0000 1.25
@@ -716,7 +716,7 @@
smlayer_startSfx(74);
break;
default:
- if(calcEnemyDamage(1, 0) == 1)
+ if (calcEnemyDamage(1, 0) == 1)
smlayer_startSfx(73);
break;
}
Index: insane_enemy.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_enemy.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- insane_enemy.cpp 20 Apr 2005 18:21:28 -0000 1.18
+++ insane_enemy.cpp 8 May 2005 21:18:36 -0000 1.19
@@ -1772,7 +1772,7 @@
smlayer_startSfx(74);
break;
case INV_HAND:
- if(calcBenDamage(1, 0))
+ if (calcBenDamage(1, 0))
smlayer_startSfx(73);
break;
}
Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- insane_scenes.cpp 20 Apr 2005 18:21:29 -0000 1.27
+++ insane_scenes.cpp 8 May 2005 21:18:37 -0000 1.28
@@ -827,17 +827,17 @@
int32 tmpSnd;
bool needMore = false;
- if(!_keyboardDisable) {
+ if (!_keyboardDisable) {
switch (_currSceneId) {
case 12:
postCase11(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
break;
case 1:
postCase0(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
- if(!smlayer_isSoundRunning(88))
+ if (!smlayer_isSoundRunning(88))
smlayer_startSfx(88);
smlayer_soundSetPan(88, ((_actor[0].x+160)>>2)+64);
- if(_tiresRustle) {
+ if (_tiresRustle) {
if (!smlayer_isSoundRunning(87))
smlayer_startSfx(87);
} else {
@@ -850,12 +850,12 @@
smlayer_stopSound(95);
smlayer_stopSound(87);
smlayer_stopSound(88);
- if(!smlayer_isSoundRunning(88))
+ if (!smlayer_isSoundRunning(88))
smlayer_startSfx(88);
break;
case 17:
postCase16(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
- if(!smlayer_isSoundRunning(88))
+ if (!smlayer_isSoundRunning(88))
smlayer_startSfx(88);
break;
case 2:
@@ -864,18 +864,18 @@
case 3:
postCase2(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
needMore = true;
- if(!smlayer_isSoundRunning(89)) {
+ if (!smlayer_isSoundRunning(89)) {
smlayer_startSfx(89);
smlayer_soundSetPriority(89, 100);
}
tmpSnd = _enemy[_currEnemy].sound;
- if(!smlayer_isSoundRunning(tmpSnd)) {
+ if (!smlayer_isSoundRunning(tmpSnd)) {
smlayer_startSfx(tmpSnd);
smlayer_soundSetPriority(tmpSnd, 100);
}
smlayer_soundSetPan(89, ((_actor[0].x+160)>>2)+64);
smlayer_soundSetPan(tmpSnd, ((_actor[1].x+160)>>2)+64);
- if(!_tiresRustle) {
+ if (!_tiresRustle) {
smlayer_stopSound(87);
} else {
if (!smlayer_isSoundRunning(87))
@@ -885,12 +885,12 @@
case 21:
postCase20(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
needMore = true;
- if(!smlayer_isSoundRunning(89)) {
+ if (!smlayer_isSoundRunning(89)) {
smlayer_startSfx(89);
smlayer_soundSetPriority(89, 100);
}
tmpSnd = _enemy[_currEnemy].sound;
- if(!smlayer_isSoundRunning(tmpSnd)) {
+ if (!smlayer_isSoundRunning(tmpSnd)) {
smlayer_startSfx(tmpSnd);
smlayer_soundSetPriority(tmpSnd, 100);
}
@@ -900,13 +900,13 @@
case 4:
case 5:
postCase3(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
- if(!smlayer_isSoundRunning(88))
+ if (!smlayer_isSoundRunning(88))
smlayer_startSfx(88);
smlayer_soundSetPan(88, ((_actor[0].x+160)>>2)+64);
break;
case 6:
postCase5(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
- if(!smlayer_isSoundRunning(88))
+ if (!smlayer_isSoundRunning(88))
smlayer_startSfx(88);
smlayer_soundSetPan(88, ((_actor[0].x+160)>>2)+64);
break;
@@ -932,12 +932,12 @@
case 13:
postCase12(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
needMore = true;
- if(!smlayer_isSoundRunning(89)) {
+ if (!smlayer_isSoundRunning(89)) {
smlayer_startSfx(89);
smlayer_soundSetPriority(89, 100);
}
tmpSnd = _enemy[_currEnemy].sound;
- if(!smlayer_isSoundRunning(tmpSnd)) {
+ if (!smlayer_isSoundRunning(tmpSnd)) {
smlayer_startSfx(tmpSnd);
smlayer_soundSetPriority(tmpSnd, 100);
}
@@ -945,7 +945,7 @@
smlayer_soundSetPan(tmpSnd, ((_actor[1].x+160)>>2)+64);
break;
case 24:
- if(!smlayer_isSoundRunning(90)) {
+ if (!smlayer_isSoundRunning(90)) {
smlayer_startSfx(90);
smlayer_soundSetPriority(90, 100);
}
More information about the Scummvm-git-logs
mailing list