[Scummvm-cvs-logs] scummvm master -> 34e8e9a876739436e84cec7f5e0013bde0fb46de
lordhoto
lordhoto at gmail.com
Mon Jan 11 13:54:30 CET 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
34e8e9a876 MADS: Rename "interface" variable to "idx".
Commit: 34e8e9a876739436e84cec7f5e0013bde0fb46de
https://github.com/scummvm/scummvm/commit/34e8e9a876739436e84cec7f5e0013bde0fb46de
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-11T13:53:35+01:00
Commit Message:
MADS: Rename "interface" variable to "idx".
interface is #define'd on WinCE and breaks compilation. We might want to
undefine it in the future to prevent these pitfalls.
Changed paths:
engines/mads/dragonsphere/dragonsphere_scenes1.cpp
diff --git a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
index 5fdf201..bb7cafe 100644
--- a/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
+++ b/engines/mads/dragonsphere/dragonsphere_scenes1.cpp
@@ -32,35 +32,35 @@ namespace MADS {
namespace Dragonsphere {
void Scene1xx::setAAName() {
- int interface;
+ int idx;
switch (_scene->_nextSceneId) {
case 108:
case 109:
- interface = 3;
+ idx = 3;
break;
case 110:
- interface = 5;
+ idx = 5;
break;
case 113:
case 114:
case 115:
case 117:
case 119:
- interface = 1;
+ idx = 1;
break;
case 116:
- interface = 2;
+ idx = 2;
break;
case 120:
- interface = 8;
+ idx = 8;
break;
default:
- interface = 0;
+ idx = 0;
break;
}
- _game._aaName = Resources::formatAAName(interface);
+ _game._aaName = Resources::formatAAName(idx);
_vm->_palette->setEntry(254, 56, 47, 32);
}
More information about the Scummvm-git-logs
mailing list