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

WINTERMUTE: "if(" -> "if ("

Browse source
This commit is contained in:
Einar Johan Trøan Sømåen 2012-07-25 21:21:55 +02:00
parent fa96c9ea18
commit 1ad859a468
23 changed files with 63 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/wintermute/ad/ad_entity.cpp
View file

@ -650,7 +650,7 @@ bool AdEntity::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
if (_theora && DID_SUCCEED(_theora->initialize(filename))) {
if (!valAlpha->isNULL()) _theora->setAlphaImage(valAlpha->getString());
_theora->play(VID_PLAY_POS, 0, 0, false, false, looping, startTime, _scale >= 0.0f ? _scale : -1.0f, _sFXVolume);
//if(m_Scale>=0) m_Theora->m_PlayZoom = m_Scale;
//if (_scale>=0) _theora->_playZoom = _scale;
stack->pushBool(true);
} else {
script->runtimeError("Entity.PlayTheora - error playing video '%s'", filename);

7
engines/wintermute/dcgf.h
View file

@ -48,11 +48,4 @@
#define COMPRESSED_FILE_MAGIC 0x504D435A // ZCMP
#ifdef GetClassName
#undef GetClassName
#endif
// macros
#define RELEASE(obj) if(obj) { obj->Release(); obj = NULL; } else 0
#endif // _DCGF_H_

8
engines/wintermute/wintermute.cpp
View file

@ -165,7 +165,7 @@ int WinterMuteEngine::init() {
bool windowedMode = !ConfMan.getBool("fullscreen");
// parse command line
char *SaveGame = NULL;
char *saveGame = NULL;
/* for (int i = 0; i < argc; i++) {
strcpy(param, argv[i]);
@ -268,9 +268,9 @@ int WinterMuteEngine::init() {
_game->loadGame(str.c_str());
}
if (SaveGame) {
_game->loadGame(SaveGame);
delete[] SaveGame;
if (saveGame) {
_game->loadGame(saveGame);
delete[] saveGame;
}
// all set, ready to go