[Scummvm-cvs-logs] scummvm master -> 5653a89e81d600b2388831cfe05c36d3068813b5

Strangerke Strangerke at scummvm.org
Mon Oct 28 07:50:48 CET 2013


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a6fbfd958d AVALANCHE: Fix CID 1109677, 1109678, 1109694, 1109695
5653a89e81 AVALANCHE: Fix CID 1109696, 1109697


Commit: a6fbfd958d372c63669f6fdc82bff39b3f151c09
    https://github.com/scummvm/scummvm/commit/a6fbfd958d372c63669f6fdc82bff39b3f151c09
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-27T23:49:38-07:00

Commit Message:
AVALANCHE: Fix CID 1109677, 1109678, 1109694, 1109695

Changed paths:
    engines/avalanche/animation.cpp
    engines/avalanche/animation.h
    engines/avalanche/menu.cpp
    engines/avalanche/menu.h



diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index ef30faa..4ddeedc 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -48,6 +48,35 @@ const int32 Animation::kCatacombMap[8][8] = {
 
 AnimationType::AnimationType(Animation *anim) {
 	_anim = anim;
+
+	_yLength = 0;
+	for (int i = 0; i < 24; i++) {
+		_mani[i] = nullptr;
+		_sil[i] = nullptr;
+	}
+	_frameNum = 0;
+	_seq = 0;
+	_characterId = 0;
+	_count = 0;
+	_facingDir = kDirNone;
+	_stepNum = 0;
+	_x = 0;
+	_y = 0;
+	_moveX = 0;
+	_moveY = 0;
+	_quick = false;
+	_visible = false;
+	_homing = false;
+	_doCheck = false;
+	_homingX = 0;
+	_homingY = 0;
+	_speedX = 0;
+	_speedY = 0;
+	_vanishIfStill = false;
+	_callEachStepFl = false;
+	_eachStepProc = Animation::kProcNone;
+	_fgBubbleCol = kColorWhite;
+	_bgBubbleCol = kColorBlack;
 }
 
 /**
@@ -370,6 +399,13 @@ Animation::Animation(AvalancheEngine *vm) {
 	for (int16 i = 0; i < kSpriteNumbMax; i++) {
 		_sprites[i] = new AnimationType(this);
 	}
+
+	_direction = kDirNone;
+	_oldDirection = kDirNone;
+	_arrowTriggered = false;
+	_geidaSpin = 0;
+	_geidaTime = 0;
+	_sayWhat = 0;
 }
 
 Animation::~Animation() {
@@ -1202,6 +1238,8 @@ void Animation::animLink() {
 			case kProcGeida :
 				geidaProcs(i);
 				break;
+			default:
+				break;
 			}
 		}
 	}
diff --git a/engines/avalanche/animation.h b/engines/avalanche/animation.h
index 33f6ab0..3223615 100644
--- a/engines/avalanche/animation.h
+++ b/engines/avalanche/animation.h
@@ -97,7 +97,8 @@ public:
 	static const byte kSpriteNumbMax = 5; // current max no. of sprites
 
 	enum Proc {
-		kProcFollowAvvyY = 1,
+		kProcNone = 0,
+		kProcFollowAvvyY,
 		kProcBackAndForth,
 		kProcFaceAvvy,
 		kProcArrow,
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index a3b61b4..7c37b79 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -207,6 +207,11 @@ void MenuItem::parseKey(char c) {
 		_menu->_vm->_sound->blip();
 }
 
+MenuBar::MenuBar() {
+	_menuNum = 0;
+	_menu = nullptr;
+}
+
 void MenuBar::init(Menu *menu) {
 	_menu = menu;
 	_menuNum = 0;
@@ -261,6 +266,9 @@ Menu::Menu(AvalancheEngine *vm) {
 	_vm = vm;
 	_activeMenuItem.init(this);
 	_menuBar.init(this);
+
+	_menuActive = false;
+	_lastPerson = kPeopleNone;
 }
 
 void Menu::findWhatYouCanDoWithIt() {
diff --git a/engines/avalanche/menu.h b/engines/avalanche/menu.h
index a7ec8bf..b7674fb 100644
--- a/engines/avalanche/menu.h
+++ b/engines/avalanche/menu.h
@@ -102,6 +102,7 @@ public:
 	HeadType _menuItems[8];
 	byte _menuNum;
 
+	MenuBar();
 	void init(Menu *menu);
 	void createMenuItem(char trig, Common::String title, char altTrig, MenuFunc setupFunc, MenuFunc chooseFunc);
 	void draw();


Commit: 5653a89e81d600b2388831cfe05c36d3068813b5
    https://github.com/scummvm/scummvm/commit/5653a89e81d600b2388831cfe05c36d3068813b5
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-27T23:49:40-07:00

Commit Message:
AVALANCHE: Fix CID 1109696, 1109697

Changed paths:
    engines/avalanche/avalot.cpp
    engines/avalanche/parser.cpp



diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index b1bbf4f..36ce16d 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -118,10 +118,13 @@ Room AvalancheEngine::_whereIs[29] = {
 
 Clock::Clock(AvalancheEngine *vm) {
 	_vm = vm;
+	// Magic value to determine if we just created the instance
 	_oldHour = _oldHourAngle = _oldMinute = 17717;
+	_hour = _minute = _second = 0;
+	_hourAngle = 0;
 }
 
-void Clock::update() { // TODO: Move variables from Gyro to here (or at least somewhere nearby), rename them.
+void Clock::update() {
 	TimeDate t;
 	_vm->_system->getTimeAndDate(t);
 	_hour = t.tm_hour;
@@ -177,7 +180,9 @@ void Clock::plotHands() {
 }
 
 void Clock::chime() {
-	if ((_oldHour == 17717) || (!_vm->_soundFx)) // Too high - must be first time around
+	// Too high - must be first time around
+	// Mute - skip the sound generation
+	if ((_oldHour == 17717) || (!_vm->_soundFx))
 		return;
 	
 	byte hour = _hour % 12;
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index b4cb64f..9b6b841 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -37,6 +37,21 @@ const char *Parser::kVersionNum = "1.30";
 
 Parser::Parser(AvalancheEngine *vm) {
 	_vm = vm;
+
+	_verb = kVerbCodePardon;
+	_thing = kPardon;
+	_person = kPeopleNone;
+	_polite = false;
+	_inputTextPos = 0;
+	_quote = false;
+	_cursorState = false;
+	_weirdWord = false;
+	_wearing = kNothing;
+	_thing2 = 0;
+	_sworeNum = 0;
+	_alcoholLevel = 0;
+	_playedNim = 0;
+	_boughtOnion = false;
 }
 
 void Parser::init() {
@@ -2457,7 +2472,7 @@ void Parser::doVerb(VerbCode id) {
 }
 
 void Parser::resetVariables() {
-	_wearing = 0;
+	_wearing = kNothing;
 	_sworeNum = 0;
 	_alcoholLevel = 0;
 	_playedNim = 0;






More information about the Scummvm-git-logs mailing list