[Scummvm-git-logs] scummvm master -> 2adc84e72862e674245ef062de484934f641177b

Strangerke Strangerke at scummvm.org
Sun Feb 12 17:56:58 CET 2017


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:
2adc84e728 CRYO: Some code simplification, remove dead code


Commit: 2adc84e72862e674245ef062de484934f641177b
    https://github.com/scummvm/scummvm/commit/2adc84e72862e674245ef062de484934f641177b
Author: Strangerke (strangerke at scummvm.org)
Date: 2017-02-12T17:44:07+01:00

Commit Message:
CRYO: Some code simplification, remove dead code

Changed paths:
    engines/cryo/eden.cpp
    engines/cryo/eden.h


diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 2e3d44f..22989f3 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -7489,7 +7489,7 @@ void EdenGame::incAngleX(int step) {
 	_angleX += step;
 	if (_angleX == 70 + 2)
 		_angleX = 0;
-	if (_angleX == 0 - 2)
+	else if (_angleX == 0 - 2)
 		_angleX = 70;
 }
 
@@ -7502,7 +7502,7 @@ void EdenGame::incAngleY(int step) {
 	_angleY += step;
 	if (_angleY == 70 + 2)
 		_angleY = 0;
-	if (_angleY == 0 - 2)
+	else if (_angleY == 0 - 2)
 		_angleY = 70;
 }
 
@@ -7520,12 +7520,13 @@ void EdenGame::incZoom() {
 }
 
 void EdenGame::decZoom() {
-	if (_zoomZ != 170) {
-		if (_zoomZ < 170)
-			_zoomZ = 170;
-		else
-			_zoomZ -= 40;
-	}
+	if (_zoomZ == 170)
+		return;
+
+	if (_zoomZ < 170)
+		_zoomZ = 170;
+	else
+		_zoomZ -= 40;
 }
 
 void EdenGame::initCubePC() {
@@ -7588,18 +7589,6 @@ void EdenGame::enginePC() {
 	renderCube();
 }
 
-////// macgame.c
-//void MyDlgHook()  {  }
-//void PrepareReply()  {  }
-int16 EdenGame::OpenDialog(void *arg1, void *arg2) {
-	//TODO
-	return 0;
-}
-
-//void SaveDialog()  {  }
-//void LostEdenMac_SavePrefs()  {  }
-//void LostEdenMac_LoadPrefs()  {  }
-
 void EdenGame::LostEdenMac_InitPrefs() {
 	_globals->_prefLanguage = 1;
 	_globals->_prefMusicVol[0] = 192;
@@ -7610,12 +7599,4 @@ void EdenGame::LostEdenMac_InitPrefs() {
 	_globals->_prefSoundVolume[1] = 32;
 }
 
-//void MacGame_DoAbout()  {  }
-//void MacGame_DoAdjustMenus()  {  }
-//void LostEdenMac_DoPreferences()  {  }
-//void MacGame_DoSave()  {  }
-//void MacGame_DoMenuCommand()  {  }
-//void MacGame_DoOpen()  {  }
-//void MacGame_DoSaveAs()  {  }
-
 }   // namespace Cryo
diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h
index c8743ca..0e200ce 100644
--- a/engines/cryo/eden.h
+++ b/engines/cryo/eden.h
@@ -502,7 +502,6 @@ private:
 	void displayPolygoneMapping(Cube *cube, CubeFace *face);
 	void drawMappingLine(int16 r3, int16 r4, int16 r5, int16 r6, int16 r7, int16 r8, int16 r9, int16 r10, int16 *lines);
 	void displayMappingLine(int16 r3, int16 r4, byte *target, byte *texture);
-	int16 OpenDialog(void *arg1, void *arg2);
 	void LostEdenMac_InitPrefs();
 
 	void initCubePC();





More information about the Scummvm-git-logs mailing list