Misc tweaks, partially bump version to 1.1

This commit is contained in:
elasota
2021-03-30 05:24:37 -04:00
parent 69f59f769d
commit 1ac69c2c75
8 changed files with 38 additions and 8 deletions

View File

@@ -12,6 +12,7 @@
#include "FileManager.h"
#include "GpIOStream.h"
#include "House.h"
#include "IGpLogDriver.h"
#include "IGpSystemServices.h"
#include "ObjectEdit.h"
#include "ResourceManager.h"
@@ -858,6 +859,11 @@ Boolean QuerySaveChanges (void)
void YellowAlert (short whichAlert, short identifier)
{
IGpLogDriver *logger = PLDrivers::GetLogDriver();
if (logger)
logger->Printf(IGpLogDriver::Category_Warning, "Yellow alert %i identifier %i", static_cast<int>(whichAlert), static_cast<int>(identifier));
#define kYellowAlert 1006
Str255 errStr, errNumStr;
short whoCares;

View File

@@ -599,7 +599,7 @@ int AppStartup()
FlushResolutionChange();
}
ShowInitialLaunchDisclaimer();
//ShowInitialLaunchDisclaimer();
}
if (thisMac.isResolutionDirty)

View File

@@ -10,12 +10,15 @@
#include "PLSound.h"
#include "DialogManager.h"
#include "Externs.h"
#include "IGpLogDriver.h"
#include "MemoryManager.h"
#include "ResourceManager.h"
#include "SoundSync.h"
#include "VirtualDirectory.h"
#include "WaveFormat.h"
#include "PLDrivers.h"
#define kBaseBufferSoundID 1000
#define kMaxSounds 64
@@ -273,26 +276,47 @@ void DumpBufferSounds (void)
PLError_t OpenSoundChannels (void)
{
IGpLogDriver *logger = PLDrivers::GetLogDriver();
if (channelOpen)
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio was already opened?");
return PLErrors::kAudioError;
}
channel0 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
if (channel0)
channelOpen = true;
else
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 0 failed to open");
return PLErrors::kAudioError;
}
channel1 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
if (channel1)
channelOpen = true;
else
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 1 failed to open");
return PLErrors::kAudioError;
}
channel2 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
if (channel2)
channelOpen = true;
else
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 2 failed to open");
return PLErrors::kAudioError;
}
return PLErrors::kNone;
}