libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 07:23:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MACVENTURE: Unify NULLs

Browse Source
This commit is contained in:
Borja Lorente 2016-08-11 10:00:50 +02:00
parent 896e08cde8
commit 1bb3d14129
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/macventure/controls.cpp
View File

@ -24,7 +24,7 @@
namespace MacVenture {
CommandButton::CommandButton() {
_gui = nullptr;
_gui = NULL;
}
CommandButton::CommandButton(ControlData data, Gui *g) {

2
engines/macventure/datafiles.cpp
View File

@ -74,7 +74,7 @@ Common::SeekableReadStream *MacVentureEngine::getBorderFile(MVWindowType windowT
filename += (isActive ? "_act.bmp" : "_inac.bmp");
if (!_dataBundle->hasFile(filename)) {
warning("Missing border file '%s' in data bundle", filename.c_str());
return nullptr;
return NULL;
}
return _dataBundle->createReadStreamForMember(filename);

14
engines/macventure/gui.cpp
View File

@ -103,11 +103,11 @@ void menuCommandsCallback(int action, Common::String &text, void *data);
Gui::Gui(MacVentureEngine *engine, Common::MacResManager *resman) {
_engine = engine;
_resourceManager = resman;
_windowData = nullptr;
_controlData = nullptr;
_windowData = NULL;
_controlData = NULL;
_draggedObj.id = 0;
_draggedObj.pos = Common::Point(0, 0);
_dialog = nullptr;
_dialog = NULL;
_cursor = new Cursor(this);
@ -846,7 +846,7 @@ void Gui::showPrebuiltDialog(PrebuiltDialogs type) {
}
bool Gui::isDialogOpen() {
return _dialog != nullptr;
return _dialog != NULL;
}
void Gui::setTextInput(Common::String str) {
@ -856,7 +856,7 @@ void Gui::setTextInput(Common::String str) {
void Gui::closeDialog() {
delete _dialog;
_dialog = nullptr;
_dialog = NULL;
}
void Gui::getTextFromUser() {
@ -950,7 +950,7 @@ Graphics::MacWindow * Gui::findWindow(WindowReference reference) {
}
switch (reference) {
case MacVenture::kNoWindow:
return nullptr;
return NULL;
case MacVenture::kCommandsWindow:
return _controlsWindow;
case MacVenture::kMainGameWindow:
@ -964,7 +964,7 @@ Graphics::MacWindow * Gui::findWindow(WindowReference reference) {
case MacVenture::kDiplomaWindow:
return _diplomaWindow;
}
return nullptr;
return NULL;
}
void Gui::ensureInventoryOpen(WindowReference reference, ObjID id) {

2
engines/macventure/sound.cpp
View File

@ -30,7 +30,7 @@ namespace MacVenture {
// SoundManager
SoundManager::SoundManager(MacVentureEngine *engine, Audio::Mixer *mixer) {
_container = nullptr;
_container = NULL;
Common::String filename = engine->getFilePath(kSoundPathID);
_container = new Container(filename);
_mixer = mixer;